remove craueconfig domain name setting and add a proper one in parameters

2024-12-22 23:56:29 +00:00 · 2017-06-01 10:42:19 +02:00 · 2017-06-01 10:42:19 +02:00 · be9d693e74
commit be9d693e74
parent 6ed2627bb3
18 changed files with 8 additions and 14 deletions
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@ -20,7 +20,6 @@ share_twitter: Aktiver deling gennem Twitter
 share_unmark: Aktiver deling gennem Unmark.it
 show_printlink: Vis et link til print-indhold
 wallabag_support_url: Support-URL for wallabag
-wallabag_url: URL for *sin* wallabag-installation
 entry: "artikel"
 export: "eksport"
 import: "import"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@ -20,7 +20,6 @@ share_twitter: Teilen zu Twitter aktiveren
 share_unmark: Teilen zu Unmark.it aktiveren
 show_printlink: Link anzeigen, um den Inhalt auszudrucken
 wallabag_support_url: Support-URL für wallabag
-wallabag_url: URL von *deiner* wallabag-Instanz
 entry: "Artikel"
 export: "Export"
 import: "Import"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@ -20,7 +20,6 @@ share_twitter: Enable share to Twitter
 share_unmark: Enable share to Unmark.it
 show_printlink: Display a link to print content
 wallabag_support_url: Support URL for wallabag
-wallabag_url: URL of *your* wallabag instance
 entry: "article"
 export: "export"
 import: "import"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@ -20,7 +20,6 @@ share_twitter: Activar compartir con Twitter
 share_unmark: Activar compartir con Unmark.it
 show_printlink: Mostrar un enlace para imprimir contenido
 wallabag_support_url: URL de soporte de wallabag
-wallabag_url: URL de *tu* instancia de wallabag
 entry: "artículo"
 export: "exportar"
 import: "importar"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@ -20,7 +20,6 @@ share_twitter:  فعال‌سازی هم‌رسانی به Twitter
 share_unmark:  فعال‌سازی هم‌رسانی به Unmark.it
 show_printlink: نمایش پیوندی برای چاپ مطلب
 wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
-wallabag_url: نشانی صفحهٔ wallabag *شما*
 entry: "مقاله"
 export: "برون‌سپاری"
 import: "درون‌ریزی"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@ -20,7 +20,6 @@ share_twitter: Activer le partage vers Twitter
 share_unmark: Activer le partage vers Unmark.it
 show_printlink: Afficher un lien pour imprimer
 wallabag_support_url: URL de support de wallabag
-wallabag_url: URL de *votre* instance de wallabag
 entry: "article"
 export: "export"
 import: "import"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@ -20,7 +20,6 @@ share_twitter: Abilita la condivisione con Twitter
 share_unmark: Abilita la condivisione con Unmark.it
 show_printlink: Mostra un collegamento per stampare il contenuto
 wallabag_support_url: URL di supporto per wallabag
-wallabag_url: URL della *tua* installazione di wallabag
 entry: "contenuto"
 export: "esporta"
 import: "importa"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@ -20,7 +20,6 @@ share_twitter: Activar lo partatge cap a Twitter
 share_unmark: Activar lo partatge cap a Unmark.it
 show_printlink: Afichar un ligam per imprimir
 wallabag_support_url: URL d'assisténcia de wallabag
-wallabag_url: URL de *vòstra* instància de wallabag
 entry: "article"
 export: "expòrt"
 import: "impòrt"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@ -20,7 +20,6 @@ share_twitter: Włącz udostępnianie dla Twitter
 share_unmark: Włącz udostępnianie dla Unmark.it
 show_printlink: Pokaż link do wydrukowania zawartości
 wallabag_support_url: Adres URL wsparcia dla wallabag
-wallabag_url: Adres *twojej* instacji wallabag
 entry: "artykuł"
 export: "eksport"
 import: "import"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
@ -20,7 +20,6 @@ share_twitter: Habilitar compartilhamento para o Twitter
 share_unmark: Habilitar compartilhamento para o Unmark.it
 show_printlink: Mostrar um link para imprimir o conteúdo
 wallabag_support_url: URL de Suporte do wallabag
-wallabag_url: URL de *sua* instância do wallabag
 entry: "artigo"
 export: "exportar"
 import: "importar"
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@ -20,7 +20,6 @@ share_twitter: Permite share către Twitter
 share_unmark: Permite share către Unmark.it
 show_printlink: Afișează un link pentru a printa content-ul
 wallabag_support_url: URL-ul de suport pentru wallabag
-wallabag_url: URL-ul instanței tale wallabag
 entry: "alticol"
 export: "exportă"
 import: "importă"
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@ -23,6 +23,8 @@ parameters:
    # with PostgreSQL and SQLite, you must set "utf8"
    database_charset: utf8mb4

+    domain_name: wallabag.me
+
    mailer_transport: smtp
    mailer_host: 127.0.0.1
    mailer_user: ~
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@ -26,6 +26,7 @@ wallabag_core:
    fetching_error_message: |
        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
    api_limit_mass_actions: 10
+    domain_name: '%domain_name%'
    default_internal_settings:
        -
            name: share_public
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@ -151,7 +151,7 @@ class ConfigController extends Controller
                'token' => $config->getRssToken(),
            ],
            'twofactor_auth' => $this->getParameter('twofactor_auth'),
-            'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
+            'wallabag_url' => $this->getParameter('domain_name'),
            'enabled_users' => $this->getDoctrine()
                ->getRepository('WallabagUserBundle:User')
                ->getSumEnabledUsers(),
--- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php
@ -62,6 +62,7 @@ class Configuration implements ConfigurationInterface
                            ->end()
                        ->end()
                    ->end()
+                ->scalarNode('domain_name')
                ->end()
            ->end()
        ;
--- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
+++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php
@ -29,6 +29,7 @@ class WallabagCoreExtension extends Extension
        $container->setParameter('wallabag_core.fetching_error_message_title', $config['fetching_error_message_title']);
        $container->setParameter('wallabag_core.api_limit_mass_actions', $config['api_limit_mass_actions']);
        $container->setParameter('wallabag_core.default_internal_settings', $config['default_internal_settings']);
+        $container->setParameter('wallabag_core.domain_name', $config['domain_name']);

        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
        $loader->load('services.yml');
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@ -122,7 +122,7 @@ services:
    wallabag_core.helper.entries_export:
        class: Wallabag\CoreBundle\Helper\EntriesExport
        arguments:
-            - '@=service(''craue_config'').get(''wallabag_url'')'
+            - '%domain_name%'
            - src/Wallabag/CoreBundle/Resources/public/themes/_global/img/appicon/apple-touch-icon-152.png

    wallabag.operator.array.matches:
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@ -7,7 +7,7 @@ services:
            - "%scheb_two_factor.email.sender_email%"
            - "%scheb_two_factor.email.sender_name%"
            - '@=service(''craue_config'').get(''wallabag_support_url'')'
-            - '@=service(''craue_config'').get(''wallabag_url'')'
+            - '%domain_name%'

    wallabag_user.password_resetting:
        class: Wallabag\UserBundle\EventListener\PasswordResettingListener