diff --git a/app/AppKernel.php b/app/AppKernel.php index aabe7579a..63d74e915 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -21,7 +21,6 @@ class AppKernel extends Kernel new JMS\SerializerBundle\JMSSerializerBundle(), new Nelmio\ApiDocBundle\NelmioApiDocBundle(), new Nelmio\CorsBundle\NelmioCorsBundle(), - new Liip\ThemeBundle\LiipThemeBundle(), new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(), new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(), new FOS\OAuthServerBundle\FOSOAuthServerBundle(), diff --git a/app/DoctrineMigrations/Version20221123132612.php b/app/DoctrineMigrations/Version20221123132612.php new file mode 100644 index 000000000..cd7bb375f --- /dev/null +++ b/app/DoctrineMigrations/Version20221123132612.php @@ -0,0 +1,32 @@ +getTable($this->getTable('config')); + + $this->skipIf(!$configTable->hasColumn('theme'), 'It seems that you already played this migration.'); + + $configTable->dropColumn('theme'); + } + + public function down(Schema $schema): void + { + $configTable = $schema->getTable($this->getTable('config')); + + $this->skipIf($configTable->hasColumn('theme'), 'It seems that you already played this migration.'); + + $configTable->addColumn('theme', 'string', [ + 'notnull' => true, + ]); + } +} diff --git a/app/config/config.yml b/app/config/config.yml index 50ba978c8..011039853 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -171,16 +171,6 @@ nelmio_cors: max_age: 3600 hosts: ['^api\.'] -liip_theme: - load_controllers: false - themes: - - material - autodetect_theme: Wallabag\CoreBundle\Helper\DetectActiveTheme - - path_patterns: - bundle_resource: - - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%" - fos_user: db_driver: orm firewall_name: secured_area diff --git a/app/config/services.yml b/app/config/services.yml index 637e7f6d0..7d392667c 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -17,7 +17,6 @@ services: $defaultLocale: '%kernel.default_locale%' $wallabagUrl: '%domain_name%' $tablePrefix: "%database_table_prefix%" - $defaultTheme: '%wallabag_core.theme%' $encryptionKeyPath: "%wallabag_core.site_credentials.encryption_key_path%" $fetchingErrorMessageTitle: "%wallabag_core.fetching_error_message_title%" $fetchingErrorMessage: '%wallabag_core.fetching_error_message%' @@ -31,7 +30,6 @@ services: $senderName: "%scheb_two_factor.email.sender_name%" $storeArticleHeaders: '@=service(''craue_config'').get(''store_article_headers'')' $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')' - $themes: '%liip_theme.themes%' Wallabag\AnnotationBundle\: resource: '../../src/Wallabag/AnnotationBundle/*' @@ -71,9 +69,6 @@ services: Lexik\Bundle\FormFilterBundle\Filter\FilterBuilderUpdaterInterface: alias: lexik_form_filter.query_builder_updater - Liip\ThemeBundle\ActiveTheme: - alias: liip_theme.active_theme - Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface: alias: scheb_two_factor.security.google_authenticator @@ -210,7 +205,6 @@ services: Wallabag\UserBundle\EventListener\CreateConfigListener: arguments: - $theme: "%wallabag_core.theme%" $itemsOnPage: "%wallabag_core.items_on_page%" $feedLimit: "%wallabag_core.feed_limit%" $language: "%wallabag_core.language%" diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 46977235e..5a16a7110 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -24,7 +24,6 @@ wallabag_core: cs: 'Čeština' el: 'Ελληνικά' items_on_page: 12 - theme: material language: '%locale%' rss_limit: 50 reading_speed: 200 diff --git a/composer.json b/composer.json index d3c8ee077..7acbb5eff 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,6 @@ "laminas/laminas-code": "^3.4", "laminas/laminas-diactoros": "^2.3", "lexik/form-filter-bundle": "^5.0.4", - "liip/theme-bundle": "^1.4.6", "mgargano/simplehtmldom": "~1.5", "mnapoli/piwik-twig-extension": "^3.0", "nelmio/api-doc-bundle": "^3.0", diff --git a/composer.lock b/composer.lock index 56e4d176d..0e57d5929 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "25b03b05eeff545aa68314784c949834", + "content-hash": "a2a09b8c7c80d9411cb07680b46952a5", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -5780,74 +5780,6 @@ }, "time": "2019-04-17T17:58:44+00:00" }, - { - "name": "liip/theme-bundle", - "version": "1.7.0", - "source": { - "type": "git", - "url": "https://github.com/liip/LiipThemeBundle.git", - "reference": "362394821ff8dcc90b06272e289e7dafe4dab52a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/362394821ff8dcc90b06272e289e7dafe4dab52a", - "reference": "362394821ff8dcc90b06272e289e7dafe4dab52a", - "shasum": "" - }, - "require": { - "php": "^7.0", - "psr/log": "~1.0", - "symfony/finder": "^3.0|^4.0", - "symfony/framework-bundle": "^3.0|^4.0", - "symfony/templating": "^3.0|^4.0", - "symfony/twig-bundle": "^3.0|^4.0", - "twig/twig": "^1.34|^2.4" - }, - "conflict": { - "sebastian/comparator": "1.2.3" - }, - "require-dev": { - "phpunit/phpunit": "^6.0", - "symfony/console": "^3.0|^4.0", - "symfony/expression-language": "^3.0|^4.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.4-dev" - } - }, - "autoload": { - "psr-4": { - "Liip\\ThemeBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Community contributions", - "homepage": "https://github.com/liip/LiipThemeBundle/contributors" - }, - { - "name": "Liip AG", - "homepage": "http://www.liip.ch/" - } - ], - "description": "Provides theming support for #Symfony2 Bundles", - "keywords": [ - "themes", - "theming" - ], - "support": { - "issues": "https://github.com/liip/LiipThemeBundle/issues", - "source": "https://github.com/liip/LiipThemeBundle/tree/1.7.0" - }, - "abandoned": "sylius/theme-bundle", - "time": "2019-06-19T12:53:08+00:00" - }, { "name": "masterminds/html5", "version": "2.7.6", diff --git a/src/Wallabag/ApiBundle/Controller/DeveloperController.php b/src/Wallabag/ApiBundle/Controller/DeveloperController.php index a8a67ad3a..179285d40 100644 --- a/src/Wallabag/ApiBundle/Controller/DeveloperController.php +++ b/src/Wallabag/ApiBundle/Controller/DeveloperController.php @@ -25,7 +25,7 @@ class DeveloperController extends Controller { $clients = $this->getDoctrine()->getRepository(Client::class)->findByUser($this->getUser()->getId()); - return $this->render('@WallabagCore/themes/common/Developer/index.html.twig', [ + return $this->render('@WallabagCore/Developer/index.html.twig', [ 'clients' => $clients, ]); } @@ -54,14 +54,14 @@ class DeveloperController extends Controller $this->get(TranslatorInterface::class)->trans('flashes.developer.notice.client_created', ['%name%' => $client->getName()]) ); - return $this->render('@WallabagCore/themes/common/Developer/client_parameters.html.twig', [ + return $this->render('@WallabagCore/Developer/client_parameters.html.twig', [ 'client_id' => $client->getPublicId(), 'client_secret' => $client->getSecret(), 'client_name' => $client->getName(), ]); } - return $this->render('@WallabagCore/themes/common/Developer/client.html.twig', [ + return $this->render('@WallabagCore/Developer/client.html.twig', [ 'form' => $clientForm->createView(), ]); } @@ -100,6 +100,6 @@ class DeveloperController extends Controller */ public function howtoFirstAppAction() { - return $this->render('@WallabagCore/themes/common/Developer/howto_app.html.twig'); + return $this->render('@WallabagCore/Developer/howto_app.html.twig'); } } diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 2db7dd93f..18c7a2798 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -8,7 +8,6 @@ use Doctrine\Persistence\ManagerRegistry; use FOS\UserBundle\Model\UserManagerInterface; use JMS\Serializer\SerializationContext; use JMS\Serializer\SerializerBuilder; -use Liip\ThemeBundle\ActiveTheme; use PragmaRX\Recovery\Recovery as BackupCodes; use Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface; use Symfony\Bundle\FrameworkBundle\Controller\Controller; @@ -55,25 +54,11 @@ class ConfigController extends Controller $configForm->handleRequest($request); if ($configForm->isSubmitted() && $configForm->isValid()) { - // force theme to material to avoid using baggy - if ('baggy' === $config->getTheme()) { - $config->setTheme('material'); - - $this->addFlash( - 'notice', - 'Baggy is gone, forced to Material theme.' - ); - } - $em->persist($config); $em->flush(); $request->getSession()->set('_locale', $config->getLanguage()); - // switch active theme - $activeTheme = $this->get(ActiveTheme::class); - $activeTheme->setName($config->getTheme()); - $this->addFlash( 'notice', 'flashes.config.notice.config_saved' diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 6c607d4d3..964e1e3e7 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -579,7 +579,7 @@ class EntryController extends Controller } return $this->render( - '@WallabagCore/themes/common/Entry/share.html.twig', + '@WallabagCore/Entry/share.html.twig', ['entry' => $entry] ); } diff --git a/src/Wallabag/CoreBundle/Controller/FeedController.php b/src/Wallabag/CoreBundle/Controller/FeedController.php index 3eed1dad4..ee0490623 100644 --- a/src/Wallabag/CoreBundle/Controller/FeedController.php +++ b/src/Wallabag/CoreBundle/Controller/FeedController.php @@ -144,7 +144,7 @@ class FeedController extends Controller } return $this->render( - '@WallabagCore/themes/common/Entry/entries.xml.twig', + '@WallabagCore/Entry/entries.xml.twig', [ 'type' => 'tag', 'url' => $url, @@ -228,7 +228,7 @@ class FeedController extends Controller } } - return $this->render('@WallabagCore/themes/common/Entry/entries.xml.twig', [ + return $this->render('@WallabagCore/Entry/entries.xml.twig', [ 'type' => $type, 'url' => $url, 'entries' => $entries, diff --git a/src/Wallabag/CoreBundle/Controller/StaticController.php b/src/Wallabag/CoreBundle/Controller/StaticController.php index fa760c144..0284f4794 100644 --- a/src/Wallabag/CoreBundle/Controller/StaticController.php +++ b/src/Wallabag/CoreBundle/Controller/StaticController.php @@ -15,7 +15,7 @@ class StaticController extends Controller $addonsUrl = $this->container->getParameter('addons_url'); return $this->render( - '@WallabagCore/themes/common/Static/howto.html.twig', + '@WallabagCore/Static/howto.html.twig', [ 'addonsUrl' => $addonsUrl, ] @@ -28,7 +28,7 @@ class StaticController extends Controller public function aboutAction() { return $this->render( - '@WallabagCore/themes/common/Static/about.html.twig', + '@WallabagCore/Static/about.html.twig', [ 'version' => $this->getParameter('wallabag_core.version'), 'paypal_url' => $this->getParameter('wallabag_core.paypal_url'), @@ -42,7 +42,7 @@ class StaticController extends Controller public function quickstartAction() { return $this->render( - '@WallabagCore/themes/common/Static/quickstart.html.twig' + '@WallabagCore/Static/quickstart.html.twig' ); } } diff --git a/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php b/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php index 6dde08e81..a8a1a78ae 100644 --- a/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php +++ b/src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php @@ -17,7 +17,6 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface { $adminConfig = new Config($this->getReference('admin-user')); - $adminConfig->setTheme('material'); $adminConfig->setItemsPerPage(30); $adminConfig->setReadingSpeed(200); $adminConfig->setLanguage('en'); @@ -30,7 +29,6 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface $this->addReference('admin-config', $adminConfig); $bobConfig = new Config($this->getReference('bob-user')); - $bobConfig->setTheme('default'); $bobConfig->setItemsPerPage(10); $bobConfig->setReadingSpeed(200); $bobConfig->setLanguage('fr'); @@ -43,7 +41,6 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface $this->addReference('bob-config', $bobConfig); $emptyConfig = new Config($this->getReference('empty-user')); - $emptyConfig->setTheme('material'); $emptyConfig->setItemsPerPage(10); $emptyConfig->setReadingSpeed(100); $emptyConfig->setLanguage('en'); diff --git a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php index 857472567..34d24b6bb 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/Configuration.php @@ -20,9 +20,6 @@ class Configuration implements ConfigurationInterface ->integerNode('items_on_page') ->defaultValue(12) ->end() - ->scalarNode('theme') - ->defaultValue('material') - ->end() ->scalarNode('language') ->defaultValue('en') ->end() diff --git a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php index ac47656c3..648595a7c 100644 --- a/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php +++ b/src/Wallabag/CoreBundle/DependencyInjection/WallabagCoreExtension.php @@ -14,7 +14,6 @@ class WallabagCoreExtension extends Extension $container->setParameter('wallabag_core.languages', $config['languages']); $container->setParameter('wallabag_core.items_on_page', $config['items_on_page']); - $container->setParameter('wallabag_core.theme', $config['theme']); $container->setParameter('wallabag_core.language', $config['language']); $container->setParameter('wallabag_core.feed_limit', $config['rss_limit']); $container->setParameter('wallabag_core.reading_speed', $config['reading_speed']); diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index f00077110..45ce69e73 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php @@ -35,14 +35,6 @@ class Config */ private $id; - /** - * @var string - * - * @Assert\NotBlank() - * @ORM\Column(name="theme", type="string", nullable=false) - */ - private $theme; - /** * @var int * @@ -162,30 +154,6 @@ class Config return $this->id; } - /** - * Set theme. - * - * @param string $theme - * - * @return Config - */ - public function setTheme($theme) - { - $this->theme = $theme; - - return $this; - } - - /** - * Get theme. - * - * @return string - */ - public function getTheme() - { - return $this->theme; - } - /** * Set itemsPerPage. * diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 2ea776512..ae8714084 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php @@ -12,38 +12,19 @@ use Wallabag\CoreBundle\Entity\Config; class ConfigType extends AbstractType { - private $themes = []; private $languages = []; /** - * @param array $themes Themes come from the LiipThemeBundle (liip_theme.themes) * @param array $languages Languages come from configuration, array just code language as key and label as value */ - public function __construct($themes, $languages) + public function __construct($languages) { - $this->themes = array_combine( - $themes, - array_map(function ($s) { - $cleanTheme = ucwords(strtolower(str_replace('-', ' ', $s))); - - if ('Baggy' === $cleanTheme) { - $cleanTheme = 'Baggy (DEPRECATED)'; - } - - return $cleanTheme; - }, $themes) - ); - $this->languages = $languages; } public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('theme', ChoiceType::class, [ - 'choices' => array_flip($this->themes), - 'label' => 'config.form_settings.theme_label', - ]) ->add('items_per_page', IntegerType::class, [ 'label' => 'config.form_settings.items_per_page_label', 'property_path' => 'itemsPerPage', diff --git a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php b/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php deleted file mode 100644 index 347c0d03b..000000000 --- a/src/Wallabag/CoreBundle/Helper/DetectActiveTheme.php +++ /dev/null @@ -1,72 +0,0 @@ -tokenStorage = $tokenStorage; - $this->defaultTheme = $defaultTheme; - $this->themes = $themes; - } - - public function setUserAgent($userAgent) - { - } - - /** - * This should return the active theme for the logged in user. - * - * Default theme for: - * - anonymous user - * - user without a config (shouldn't happen ..) - * - * @return string - */ - public function getType() - { - $token = $this->tokenStorage->getToken(); - - if (null === $token) { - return $this->defaultTheme; - } - - $user = $token->getUser(); - - if (!$user instanceof User) { - return $this->defaultTheme; - } - - $config = $user->getConfig(); - - if (!$config) { - return $this->defaultTheme; - } - - if (!\in_array($config->getTheme(), $this->themes, true)) { - return $this->defaultTheme; - } - - return $config->getTheme(); - } -} diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.cs.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.cs.yml index a832d1ff5..6e4411e6f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.cs.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.cs.yml @@ -221,11 +221,9 @@ config: language_label: Jazyk help_pocket_consumer_key: Vyžadováno pro import z Pocketu. Můžete ho vytvořit ve svém účtu Pocket. help_items_per_page: Můžete změnit počet článků zobrazených na každé stránce. - help_theme: wallabag je přizpůsobitelný. Zde si můžete vybrat upřednostňovaný motiv. android_instruction: Klepnutím sem předvyplníte svou aplikaci pro Android android_configuration: Nakonfigurujte svou aplikaci pro Android pocket_consumer_key_label: Zákaznický klíč pro Pocket k importu obsahu - theme_label: Motiv form_password: new_password_label: Nové heslo old_password_label: Aktuální heslo @@ -643,7 +641,6 @@ howto: arrows_navigation: Procházet články hide_form: Skrýt aktuální formulář (hledat nebo nový odkaz) add_link: Přidat nový odkaz - material_title: Klávesové zkratky dostupné pouze s motivem Material delete: Odstranit položku toggle_favorite: Přepnout stav označení hvězdičkou pro položku toggle_archive: Přepnout stav přečtení pro položku diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index a25a4a27c..fff6f7932 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -69,7 +69,6 @@ config: form: save: Speichern form_settings: - theme_label: Theme items_per_page_label: Einträge pro Seite language_label: Sprache reading_speed: @@ -86,7 +85,6 @@ config: pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren android_configuration: Konfiguriere deine Android-App android_instruction: Hier berühren, um deine Android-App auszufüllen - help_theme: wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen. help_items_per_page: Du kannst die Nummer von Artikeln pro Seite anpassen. help_reading_speed: wallabag berechnet eine Lesezeit pro Artikel. Hier kannst du definieren, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeiten danach neu berechnen. help_language: Du kannst die Sprache der wallabag-Oberfläche ändern. @@ -414,7 +412,6 @@ howto: toggle_favorite: Favorit-Status für den Artikel ändern toggle_archive: Archiviert-Status für den Artikel ändern delete: Artikel löschen - material_title: Tastenkürzel des Material-Theme add_link: Neuen Link hinzufügen hide_form: Aktuelles Formular verstecken (Suche oder neuer Link) arrows_navigation: Durch Artikel navigieren diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.el.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.el.yml index a822a127f..81aa43b8c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.el.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.el.yml @@ -308,7 +308,6 @@ howto: arrows_navigation: Πλοήγηση στα άρθρα hide_form: Απόκρυψη της τρέχουσας φόρμας (αναζήτηση ή νέος σύνδεσμος) add_link: Προσθήκη νέου συνδέσμου - material_title: Διαθέσιμες συντομεύσεις μόνο με το θέμα Material delete: Διαγραφή της καταχώρισης toggle_archive: Εναλλαγή κατάστασης αναγνωσμένου για την καταχώριση toggle_favorite: Εναλλαγή κατάστασης αγαπημένου για την καταχώριση @@ -595,7 +594,6 @@ config: help_language: Μπορείτε να αλλάξετε τη γλώσσα της διεπαφής του wallabag. help_reading_speed: Το wallabag υπολογίζει τον χρόνο ανάγνωσής σας για κάθε άρθρο. Μπορείτε να ορίσετε εδώ, χάρη σε αυτή τη λίστα, αν είστε γρήγορος ή αργός αναγνώστης. Το wallabag θα επανυπολογίσει τον χρόνο ανάγνωσης για κάθε άρθρο. help_items_per_page: Μπορείτε να αλλάξετε τον αριθμό των άρθρων που προβάλλονται σε κάθε σελίδα. - help_theme: Το wallabag μπορεί να προσαρμοστεί. Εδώ μπορείτε να επιλέξετε το θέμα που προτιμάτε. android_instruction: Πατήστε εδώ για να γεμίσετε από πριν την εφαρμογή Android android_configuration: Ρύθμιση της εφαρμογής Android pocket_consumer_key_label: Κλειδί επαλήθευσης Pocket για την εισαγωγή περιεχομένου @@ -612,7 +610,6 @@ config: label: Ταχύτητα ανάγνωσης language_label: Γλώσσα items_per_page_label: Αντικείμενα ανά σελίδα - theme_label: Θέμα form: save: Αποθήκευση page_title: Ρυθμίσεις diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index defd81ac7..3f210b58f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -68,7 +68,6 @@ config: form: save: Save form_settings: - theme_label: Theme items_per_page_label: Items per page language_label: Language reading_speed: @@ -85,7 +84,6 @@ config: pocket_consumer_key_label: Consumer key for Pocket to import contents android_configuration: Configure your Android app android_instruction: Touch here to prefill your Android app - help_theme: wallabag is customizable. You can choose your prefered theme here. help_items_per_page: You can change the number of articles displayed on each page. help_reading_speed: wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article. help_language: You can change the language of wallabag interface. @@ -398,7 +396,6 @@ howto: toggle_favorite: Toggle star status for the entry toggle_archive: Toggle read status for the entry delete: Delete the entry - material_title: Shortcuts available with Material theme only add_link: Add a new link hide_form: Hide the current form (search or new link) arrows_navigation: Navigate through articles diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 6cc2367c0..8de96c115 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -66,7 +66,6 @@ config: form: save: 'Guardar' form_settings: - theme_label: 'Tema' items_per_page_label: 'Número de artículos por página' language_label: 'Idioma' reading_speed: @@ -82,7 +81,6 @@ config: redirect_current_page: 'Permanecer en la página actual' pocket_consumer_key_label: Clave de consumidor para importar contenidos de Pocket android_configuration: Configura tu aplicación Android - help_theme: "wallabag es personalizable. Puedes elegir tu tema preferido aquí." help_items_per_page: "Puedes cambiar el número de artículos mostrados en cada página." help_reading_speed: "wallabag calcula un tiempo de lectura para cada artículo. Aquí puedes definir, gracias a esta lista, si eres un lector rápido o lento. wallabag recalculará el tiempo de lectura para cada artículo." help_language: "Puedes cambiar el idioma de la interfaz de wallabag." @@ -388,7 +386,6 @@ howto: toggle_favorite: Marcar como favorito / no favorito el artículo toggle_archive: Marcar como leído / no leído el artículo delete: Borrar el artículo - material_title: Atajos de teclado disponibles solo en el tema Material add_link: Añadir un nuevo artículo hide_form: Ocultar el formulario actual (búsqueda o nuevo artículo) arrows_navigation: Navegar por los artículos diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 7adedc13e..41c0ce50d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -68,7 +68,6 @@ config: form: save: Enregistrer form_settings: - theme_label: Thème items_per_page_label: Nombre d’articles par page language_label: Langue reading_speed: @@ -85,7 +84,6 @@ config: pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données android_configuration: Configurez votre application Android android_instruction: Appuyez ici pour préremplir votre application Android - help_theme: L’affichage de wallabag est personnalisable. C’est ici que vous choisissez le thème que vous préférez. help_items_per_page: Vous pouvez définir le nombre d’articles affichés sur chaque page. help_reading_speed: wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article. help_language: Vous pouvez définir la langue de l’interface de wallabag. @@ -398,7 +396,6 @@ howto: toggle_favorite: Changer le statut Favori de l’article toggle_archive: Changer le status Lu de l’article delete: Supprimer l’article - material_title: Raccourcis disponibles avec le thème Material uniquement add_link: Ajouter un nouvel article hide_form: Masquer le formulaire courant (recherche ou nouvel article) arrows_navigation: Naviguer à travers les articles diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.gl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.gl.yml index bedbfc107..7c16a7d1e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.gl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.gl.yml @@ -19,7 +19,6 @@ howto: arrows_navigation: Navegar polos artigos hide_form: Agochar o formulario actual (busca ou nova ligazón) add_link: Engadir nova ligazón - material_title: Atallos dispoñibles só para o decorado Material delete: Eliminar o artigo toggle_archive: Marcar como lido o artigo toggle_favorite: Marcar con estrela o artigo @@ -271,7 +270,6 @@ config: help_language: Podes cambiar o idioma da interface de wallabag. help_reading_speed: wallabag calcula o tempo de lectura de cada artigo. Podes definir aquí, grazas a esta lista, se es lectora rápida ou lenta. wallabag volverá a calcular a velocidade de lectura para cada artigo. help_items_per_page: Podes cambiar o número de artigos mostrados en cada páxina. - help_theme: wallabag é personalizable. Podes escoller o teu decorado preferido. android_configuration: Configurar a app Android pocket_consumer_key_label: Consumer Key para importar contidos de Pocket action_mark_as_read: @@ -287,7 +285,6 @@ config: label: Velocidade de lectura language_label: Idioma items_per_page_label: Elementos por páxina - theme_label: Decorado form_password: repeat_new_password_label: Repite o novo contrasinal new_password_label: Novo contrasinal diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.hr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.hr.yml index 63257daf9..854fbc0ce 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.hr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.hr.yml @@ -197,9 +197,7 @@ config: import_submit: Uvezi file_label: JSON datoteka form_settings: - theme_label: Tema help_items_per_page: Možeš promijeniti broj prikazanih članaka na svakoj stranici. - help_theme: wallabag je prilagodljiv. Ovdje možeš odabrati željenu temu. action_mark_as_read: label: Što učiniti nakon što se članak ukloni, označi kao omiljeni ili kao pročitani? redirect_current_page: Ostani na trenutačnoj stranici @@ -341,7 +339,6 @@ howto: action: Akcija toggle_favorite: Uklj/isklj stanje favorita za zapis go_all: Idi na sve zapise - material_title: Dostupni prečaci samo za Material temu add_link: Dodaj novu poveznicu toggle_archive: Uklj/Isklj stanje čitanja za zapis list_title: Dostupni prečaci na stranicama popisa diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.hu.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.hu.yml index bd22f314c..653b21c63 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.hu.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.hu.yml @@ -58,7 +58,6 @@ config: form: save: Mentés form_settings: - theme_label: Kinézet items_per_page_label: Oldalankénti elemek száma language_label: Nyelv reading_speed: @@ -75,7 +74,6 @@ config: pocket_consumer_key_label: A tartalom importálásához szükséges Pocket „Consumer key” android_configuration: Az Android alkalmazásának beállítása android_instruction: Érintsen ide az Android alkalmazásának előtöltéséhez - help_theme: A wallabag testre szabható. Itt kiválaszthatja a preferált kinézetét. help_items_per_page: Megváltoztathatja az oldalanként megjelenített cikkek számát. help_reading_speed: A wallabag kiszámítja az elolvasási időt minden egyes cikkre. Itt meghatározhatja, ennek a listának köszönhetően, hogy mennyire gyors vagy lassú olvasó. A wallabag újra ki fogja számítani az elolvasási időt minden egyes cikkre. help_language: Megváltoztathatja a wallabag felületének a nyelvét. @@ -330,7 +328,6 @@ howto: toggle_favorite: A bejegyzés csillagozott állapotának átváltása toggle_archive: A bejegyzés olvasott állapotának átváltása delete: A bejegyzés törlése - material_title: Kizárólag a „Material” kinézet esetén elérhető gyorsbillentyűk add_link: Új hivatkozás hozzáadása hide_form: A jelenlegi mező elrejtése (keresés vagy új hivatkozás) arrows_navigation: Navigálás a cikkek között diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index bbe3a5366..e68ca2e2a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -67,7 +67,6 @@ config: form: save: Salva form_settings: - theme_label: Tema items_per_page_label: Elementi per pagina language_label: Lingua reading_speed: @@ -84,7 +83,6 @@ config: pocket_consumer_key_label: Consumer key per Pocket usata per per importare i contenuti android_configuration: Configura la tua applicazione Android android_instruction: Tocca qui per preriempire la tua applicazione Android - help_theme: wallabag è personalizzabile. Qui puoi scegliere il tuo tema preferito. help_items_per_page: Puoi cambiare il numero di articoli mostrati su ogni pagina. help_reading_speed: wallabag calcola un tempo di lettura per ogni articolo. Puoi definire qui, grazie a questa lista, se sei un lettore lento o veloce. wallabag ricalcolerà la velocità di lettura per ogni articolo. help_language: Puoi cambiare la lingua dell'interfaccia di wallabag. @@ -347,7 +345,6 @@ howto: toggle_favorite: Cambia stato Preferito dell'articolo toggle_archive: Cambia stato Letto dell'articolo in letto delete: Cancella l'articolo - material_title: Scorciatoie disponibili solo con il tema Material add_link: Aggiungi un nuovo link hide_form: Nascondi il modulo corrente (ricerca o nuovo link) arrows_navigation: Naviga tra gli articoli diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml index 1b5200966..96b2ae2c0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ja.yml @@ -69,7 +69,6 @@ config: form: save: 保存 form_settings: - theme_label: テーマ items_per_page_label: ページあたりのアイテム language_label: 言語 reading_speed: @@ -89,7 +88,6 @@ config: redirect_current_page: 現在のページに留まる label: 記事に既読やスターをつけた後、どこに移動しますか？ android_configuration: Androidアプリの設定をする - help_theme: wallabagはカスタマイズ可能です。お気に入りのテーマを選べます。 android_instruction: ここをタッチするとあなたのAndroid アプリに自動入力します form_rss: description: wallabag が提供する RSS フィードは、お好みの RSS リーダーで保存した記事を読むできます。最初にトークンを生成する必要があります。 @@ -382,7 +380,6 @@ howto: arrows_navigation: 記事を移動する hide_form: 現在の入力フォームを隠す（検索 または リンク） add_link: 新しいリンクを追加する - material_title: マテリアルテーマのみで使用可能なショートカット delete: 記事を削除する toggle_archive: 既読状態を切り替える toggle_favorite: スターの状態を切り替える diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ko.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ko.yml index 7bcc810dc..4f57aa3f9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ko.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ko.yml @@ -261,7 +261,6 @@ howto: arrows_navigation: 문서 탐색 hide_form: 현재 양식 숨기기 (검색 또는 새 링크) add_link: 새 링크 추가 - material_title: 머티리얼 테마에서만 사용할 수있는 단축키 toggle_archive: 문서 읽음 상태 전환 delete: 문서 삭제 toggle_favorite: 문서의 즐겨찾기 상태 전환 @@ -486,7 +485,6 @@ config: items_per_page_label: 페이지 당 항목 help_pocket_consumer_key: Pocket 가져오기에 필요합니다. Pocket 계정에서 만들 수 있습니다. help_language: wallabag 인터페이스 언어를 변경할 수 있습니다. - help_theme: wallabag은 사용자 정의할 수 있습니다. 여기에서 원하는 테마를 선택할 수 있습니다. android_instruction: Android 앱 정보를 입력하려면 여기를 클릭하세요 android_configuration: Android 앱 구성 pocket_consumer_key_label: 콘텐츠를 가져 오기 위한 Pocket의 Consumer key @@ -498,7 +496,6 @@ config: help_message: '온라인 도구를 사용하여 읽기 속도를 측정 할 수 있습니다:' label: 읽기 속도 language_label: 언어 - theme_label: 테마 otp: app: qrcode_label: QR 코드 diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.nb.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.nb.yml index 16fac9533..8d71c90d2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.nb.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.nb.yml @@ -64,7 +64,6 @@ config: form: save: Lagre form_settings: - theme_label: Drakt items_per_page_label: Elementer per side language_label: Språk reading_speed: @@ -83,7 +82,6 @@ config: help_pocket_consumer_key: Kreves for Pocket-import. Kan opprettes i din Pocket-konto. help_language: Du kan endre språk for wallabag-grensesnittet. help_items_per_page: Du kan endre antallet artikler som vises på hver side. - help_theme: wallabag kan tilpasset. Du kan velge foretrukket drakt her. android_instruction: Trykk her for å forhåndsutfylle ditt Android-program android_configuration: Sett opp ditt Android-program form_rss: @@ -433,7 +431,6 @@ howto: arrows_navigation: Naviger gjennom artikler hide_form: Skjul nåværende skjema (søk eller ny lenke) add_link: Legg til ny lenke - material_title: Snarveier kun tilgjengelige i materiell drakt toggle_archive: Veksle lesestatus for oppføringer toggle_favorite: Veksle stjernemerkingsstatus for oppføringen open_original: Åpne opprinnelig nettadresse for oppføringen diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.nl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.nl.yml index de0225cdd..3b0eadf22 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.nl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.nl.yml @@ -13,12 +13,10 @@ config: label: Leessnelheid language_label: Taal items_per_page_label: Items per pagina - theme_label: Thema help_pocket_consumer_key: Verplicht voor het importeren uit Pocket. U kan dit aanmaken in uw Pocket account. help_language: U kan de taal van wallabag aanpassen. help_reading_speed: wallabag berekend een leestijd voor ieder artikel. U kan hier aangeven of u een snelle of langzame lezer bent waardoor wallabag een accurate tijd kan berekenen per artikel. help_items_per_page: U kan de hoeveelheid getoonde artikelen per pagina aanpassen. - help_theme: wallabag is aanpasbaar. U can uw gewenste thema hier selecteren. android_instruction: Tik hier om uw Android-appvooraf in te vullen android_configuration: Configureer uw Android applicatie pocket_consumer_key_label: Consumer key voor Pocket om inhoud te importeren @@ -523,7 +521,6 @@ howto: arrows_navigation: Navigeer door artikelen hide_form: Verberg het huidige formulier (zoeken of nieuwe link) add_link: Voeg nieuwe link toe - material_title: Snelkoppelingen alleen beschikbaar met Material thema delete: Verwijder het item toggle_archive: Verander lees status van het item toggle_favorite: Verander gemarkeerd status van het item diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index f6cb8596b..3dda22040 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -65,7 +65,6 @@ config: form: save: Enregistrar form_settings: - theme_label: Tèma items_per_page_label: Nombre d'articles per pagina language_label: Lenga reading_speed: @@ -82,7 +81,6 @@ config: pocket_consumer_key_label: Clau d’autentificacion Pocket per importar las donadas android_configuration: Configuratz vòstra aplicacion Android android_instruction: Tocatz aquí per garnir las informacions de l'aplicacion Android - help_theme: wallabag es personalizable. Podètz causir vòstre tèma preferit aquí. help_items_per_page: Podètz cambiar lo nombre d'articles afichats per pagina. help_reading_speed: wallabag calcula lo temps de lectura per cada article. Podètz lo definir aquí, gràcias a aquesta lista, se sètz un legeire rapid o lent. wallabag tornarà calcular lo temps de lectura per cada article. help_language: Podètz cambiar la lenga de l'interfàcia de wallabag. @@ -342,7 +340,6 @@ howto: toggle_favorite: Cambiar l'estatut Favorit per l'article toggle_archive: Cambiar l'estatut Legit per l'article delete: Suprimir l'article - material_title: Acorchis solament disponibles amb lo tèma Material add_link: Apondre un acorchi hide_form: Rescondre lo formulari actual (recèrca o nòu ligam) arrows_navigation: Navigar dins los articles diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 973595d9a..d75c4185d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -69,7 +69,6 @@ config: form: save: Zapisz form_settings: - theme_label: Temat items_per_page_label: Liczba elementów na stronie language_label: Język reading_speed: @@ -86,7 +85,6 @@ config: pocket_consumer_key_label: Klucz klienta Pocket do importu zawartości android_configuration: Skonfiguruj swoją androidową aplikację android_instruction: Dotknij tutaj, aby wstępnie uzupełnij androidową aplikację - help_theme: Dopasuj wallabag do swoich potrzeb. Tutaj możesz wybrać preferowany przez ciebie motyw. help_items_per_page: Możesz zmienić liczbę artykułów wyświetlanych na każdej stronie. help_reading_speed: wallabag oblicza czas czytania każdego artykułu. Możesz tutaj określić, dzięki tej liście, czy jesteś szybkim czy powolnym czytelnikiem. wallabag przeliczy czas czytania każdego artykułu. help_language: Możesz zmienić język interfejsu wallabag. @@ -414,7 +412,6 @@ howto: toggle_favorite: Oznacz wpis gwiazdką toggle_archive: Oznacz wpis jako przeczytany delete: Usuń wpis - material_title: Skróty dostępne wyłącznie w motywie Material add_link: Dodaj nowy link hide_form: Ukryj obecny formularz (wyszukiwania lub nowego linku) arrows_navigation: Nawiguj pomiędzy artykułami diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 588faa742..e20c3ad2c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -65,7 +65,6 @@ config: form: save: 'Guardar' form_settings: - theme_label: 'Tema' items_per_page_label: 'Itens por página' language_label: 'Idioma' reading_speed: @@ -76,7 +75,6 @@ config: 300_word: 'Posso ler ~300 palavras por minuto' 400_word: 'Posso ler ~400 palavras por minuto' pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' - help_theme: o wallabag é personalizável. Pode escolher o tema que pretender aqui. help_pocket_consumer_key: Necessário para importar do Pocket. Pode criá-lo na sua conta do Pocket. form_rss: description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml index 7df8d8d41..95410d503 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ru.yml @@ -68,7 +68,6 @@ config: form: save: 'Сохранить' form_settings: - theme_label: 'Тема' items_per_page_label: 'Записей на странице' language_label: 'Язык' reading_speed: @@ -84,7 +83,6 @@ config: redirect_current_page: 'На текущую страницу' pocket_consumer_key_label: "Ключ от Pocket для импорта контента" android_configuration: "Настройте Ваше Android приложение" - help_theme: "wallabag настраиваемый, здесь Вы можете выбрать тему." help_items_per_page: "Вы можете выбрать количество отображаемых записей на странице." help_reading_speed: "wallabag посчитает сколько времени занимает чтение каждой записи. Вы можете определить здесь, как быстро вы читаете. wallabag пересчитает время чтения для каждой записи." help_language: "Вы можете изменить язык интерфейса wallabag." @@ -409,7 +407,6 @@ howto: toggle_favorite: "Переключить пометку звездочкой для записи" toggle_archive: "Переключить пометку о прочтении для записи" delete: "Удалить запись" - material_title: "Горячие клавиши доступные только в Material теме" add_link: "Добавить новую запись" hide_form: "Скрыть текущую форму (поисковую или новой ссылки)" arrows_navigation: "Навигация по статьям" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml index 84e289b27..f06847668 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml @@ -60,7 +60,6 @@ config: form: save: 'บันทึก' form_settings: - theme_label: 'ธีม' items_per_page_label: 'ไอเทมต่อหน้า' language_label: 'ภาษา' reading_speed: @@ -73,7 +72,6 @@ config: pocket_consumer_key_label: คีย์ของลูกค้าที่ไว้เก็บเพื่อนำข้อมูลเนื่อหาเข้า android_configuration: การกำหนดค่าของแอนดรอยแอพพลิเคชั่น android_instruction: "แตะตับที่นี้เพื่อเพิ่มเติมแอนดรอยแอพพลิเคชั่นของคุณ" - help_theme: "wallabag เป็นการปรับแต่งที่คุณสามารถเลือกธีมที่คุณต้องการได้ที่นี้" help_items_per_page: "คุณสามารถเปลี่ยนจำนวนรายการที่แสดงผลในแต่ละหน้า" help_reading_speed: "wallabag จะคำนวณเวลาการอ่านในแต่ละรายการซึ่งคุณสามารถกำหนดได้ที่นี้,ต้องขอบคุณรายการนี้,หากคุณเป็นนักอ่านที่เร็วหรือช้า wallabag จะทำการคำนวณเวลาที่อ่านใหม่ในแต่ละรายการ" help_language: "คุณสามารถเปลี่ยภาษาของ wallabag interface ได้" @@ -318,7 +316,6 @@ howto: toggle_favorite: เครื่องหมายของสถานะดาวสำหรับรายการ toggle_archive: เครื่องหมายสถานะการอ่านสำหรับรายการ delete: ลบรายการ - material_title: ใช้ Shortcut กับ เนื้อหาของธีมเฉพาะ add_link: เพิ่มลิงค์ใหม่ hide_form: ซ่อนในปัจุบันจาก (ค้นหา หรือ ลิงค์ใหม่) arrows_navigation: นำไปที่บทความ diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 3bf4cdc60..d4b1652be 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -69,7 +69,6 @@ config: form: save: Kaydet form_settings: - theme_label: Tema items_per_page_label: Sayfa başına makale sayısı language_label: Dil reading_speed: @@ -86,7 +85,6 @@ config: pocket_consumer_key_label: Pocket'tan içerikleri aktarmak için Consumer anahtarı android_configuration: Android uygulamanızı ayarlayın android_instruction: Android uygulamanızın bilgilerini doldurmak için buraya tıklayın - help_theme: wallabag istediğiniz şekilde özelleştirilebilir. Buradan tercih ettiğiniz temayı seçebilirsiniz. help_items_per_page: Sayfa başına görüntülenecek makale sayısını değiştirebilirsiniz. help_reading_speed: wallabag her bir makale için ortalama okuma sürenizi hesaplar. Buradan, bunun sayesinde hızlı veya yavaş okuyan birisi olduğunuzu tanımlayabilirsiniz. Wallabag her bir makale okunması ardından bunu yeniden hesaplayacaktır. help_language: Wallabag arayüzünü kullanacağınız dili değiştirebilirsiniz. @@ -414,7 +412,6 @@ howto: toggle_favorite: Makalenin favorileme durumunu değiştir toggle_archive: Makalenin okundu durumunu değiştir delete: Makaleyi sil - material_title: Sadece material temasında kullanılabilen kısayollar add_link: Yeni bir bağlantı ekle hide_form: Mevcut formu gizle (arama veya yeni bağlantı) arrows_navigation: Makaleler arasında geçiş yap diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.uk.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.uk.yml index fd1b4e954..25a2a165b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.uk.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.uk.yml @@ -67,7 +67,6 @@ config: form: save: Зберегти form_settings: - theme_label: Тема items_per_page_label: Статей на сторінку language_label: Мова reading_speed: @@ -84,7 +83,6 @@ config: pocket_consumer_key_label: Consumer key із Pocket для імпорту контенту android_configuration: Налаштувати Android-застосунок android_instruction: '' - help_theme: '' help_items_per_page: '' help_reading_speed: '' help_language: '' @@ -369,7 +367,6 @@ howto: toggle_favorite: '' toggle_archive: '' delete: Видалити запис - material_title: Гарячі клавіші доступні тільки у темі Material add_link: Додати нове посилання hide_form: '' arrows_navigation: Навігація по статтях diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml index bac865bed..74293e9b5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.zh.yml @@ -69,7 +69,6 @@ config: form: save: '保存' form_settings: - theme_label: '主题' items_per_page_label: '每页项目数' language_label: '语言' reading_speed: @@ -86,7 +85,6 @@ config: pocket_consumer_key_label: '用于从 Pocket 导入内容的 Consumer key' android_configuration: '配置你的 Android 应用程序' android_instruction: "点按此处以预填充你的 Android 应用" - help_theme: "wallabag 是可定制的，你可以在这里选择你喜欢的主题。" help_items_per_page: "你可以选择每页显示的文章数目。" help_reading_speed: "wallabag 会为每篇文章计算阅读时间，你可以通过这个列表选择自己是个速读者或是慢读者。wallabag 会根据你的选择重新计算每篇文章的阅读时间。" help_language: "你可以在此处更改 wallabag 的界面语言。" @@ -414,7 +412,6 @@ howto: toggle_favorite: 改变项目的收藏状态 toggle_archive: 改变项目的已读状态 delete: 删除项目 - material_title: 仅可用于 Material 主题的快捷键 add_link: 保存新链接 hide_form: 隐藏当前表单（搜索或添加新链接时) arrows_navigation: 在项目间导航 diff --git a/src/Wallabag/CoreBundle/Resources/views/.DS_Store b/src/Wallabag/CoreBundle/Resources/views/.DS_Store new file mode 100644 index 000000000..c3922be93 Binary files /dev/null and b/src/Wallabag/CoreBundle/Resources/views/.DS_Store differ diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig similarity index 97% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig index 5a22253f1..7f31d2983 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig @@ -25,19 +25,6 @@ {{ form_start(form.config) }} {{ form_errors(form.config) }} -
-
- {{ form_errors(form.config.theme) }} - {{ form_widget(form.config.theme) }} - {{ form_label(form.config.theme) }} -
-
- - live_help - -
-
-
{{ form_errors(form.config.items_per_page) }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/Config/otp_app.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Config/otp_app.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Config/otp_app.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig b/src/Wallabag/CoreBundle/Resources/views/Developer/client.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Developer/client.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig b/src/Wallabag/CoreBundle/Resources/views/Developer/client_parameters.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/client_parameters.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Developer/client_parameters.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig b/src/Wallabag/CoreBundle/Resources/views/Developer/howto_app.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/howto_app.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Developer/howto_app.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/Developer/index.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Developer/index.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/Card/_content.html.twig similarity index 75% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/Card/_content.html.twig index ecb22c71d..f1038a9ae 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/Card/_content.html.twig @@ -9,9 +9,9 @@
{{ entry.domainName|removeWww }} {% if withMetadata is defined %} - {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags|slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %} + {% include "@WallabagCore/Entry/_tags.html.twig" with {'tags': entry.tags|slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %}
-
{% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
+
{% include "@WallabagCore/Entry/_reading_time.html.twig" with {'entry': entry} only %}
{% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_mass_checkbox.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/Card/_mass_checkbox.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_mass_checkbox.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/Card/_mass_checkbox.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/_card_actions.html.twig similarity index 95% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/_card_actions.html.twig index 4e751c9bb..0b6d9701e 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/_card_actions.html.twig @@ -1,6 +1,6 @@
-
{% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}
+
{% include "@WallabagCore/Entry/_reading_time.html.twig" with {'entry': entry} only %}
today  {{ entry.createdAt|date('Y-m-d') }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/_card_full_image.html.twig similarity index 74% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/_card_full_image.html.twig index bbf8e1450..6ca075576 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/_card_full_image.html.twig @@ -10,8 +10,8 @@
- {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry} only %} + {% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry} only %}
- {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %} + {% include "@WallabagCore/Entry/_card_actions.html.twig" with {'entry': entry} only %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/_card_list.html.twig similarity index 84% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/_card_list.html.twig index 7e43da63c..dfad1279c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/_card_list.html.twig @@ -1,12 +1,12 @@
- {% include "@WallabagCore/themes/material/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %} + {% include "@WallabagCore/Entry/Card/_mass_checkbox.html.twig" with {'entry': entry} only %}
{% set preview_class_modifier = entry.previewPicture ? '' : ' preview--default' %}
- {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %} + {% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %}
  • language diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/_card_preview.html.twig similarity index 86% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/_card_preview.html.twig index 8e4ba2e40..4ab5e44ea 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/_card_preview.html.twig @@ -11,7 +11,7 @@
- {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %} + {% include "@WallabagCore/Entry/Card/_content.html.twig" with {'entry': entry, 'withPreview': true} only %}
@@ -31,5 +31,5 @@
- {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %} + {% include "@WallabagCore/Entry/_card_actions.html.twig" with {'entry': entry} only %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/_feed_link.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_feed_link.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/_feed_link.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/_reading_time.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_reading_time.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/_reading_time.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/_tags.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_tags.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/_tags.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/_title.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/_title.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/edit.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/edit.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig similarity index 93% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig index a6b6557c8..7368bfcee 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig @@ -15,7 +15,7 @@ {% if searchTerm is defined and searchTerm is not empty %} {% set filter = searchTerm %} {% endif %} - {% include "@WallabagCore/themes/common/Entry/_title.html.twig" with {'filter': filter} %} + {% include "@WallabagCore/Entry/_title.html.twig" with {'filter': filter} %} {% endblock %} {% block content %} @@ -31,7 +31,7 @@ {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }} {% if list_mode == 0 %}view_list{% else %}view_module{% endif %} {% if app.user.config.feedToken %} - {% include "@WallabagCore/themes/common/Entry/_feed_link.html.twig" %} + {% include "@WallabagCore/Entry/_feed_link.html.twig" %} {% endif %} {% if current_route == 'search' %}
{{ 'entry.list.assign_search_tag'|trans }}
{% endif %} @@ -66,11 +66,11 @@ {% for entry in entries %}
  • {% if list_mode == 1 %} - {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} + {% include "@WallabagCore/Entry/_card_list.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %} - {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} + {% include "@WallabagCore/Entry/_card_full_image.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} {% else %} - {% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} + {% include "@WallabagCore/Entry/_card_preview.html.twig" with {'entry': entry, 'currentRoute': current_route, 'routes': entries_with_archived_class_routes} only %} {% endif %}
    • {% endfor %} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/entries.xml.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/entries.xml.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig similarity index 98% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig index 93a4ee5c9..071ebb251 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig @@ -240,7 +240,7 @@
    - {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags, 'entryId': entry.id, 'withRemove': true} only %} + {% include "@WallabagCore/Entry/_tags.html.twig" with {'tags': entry.tags, 'entryId': entry.id, 'withRemove': true} only %}
    @@ -106,6 +106,22 @@ g l {{ 'howto.shortcuts.go_logout'|trans }} + + g n + {{ 'howto.shortcuts.add_link'|trans }} + + + esc + {{ 'howto.shortcuts.hide_form'|trans }} + + + ← → + {{ 'howto.shortcuts.arrows_navigation'|trans }} + + + enter + {{ 'howto.shortcuts.open_article'|trans }} + @@ -156,36 +172,6 @@ - -
    {{ 'howto.shortcuts.material_title'|trans }}
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ 'howto.shortcuts.shortcut'|trans }}{{ 'howto.shortcuts.action'|trans }}
    g n{{ 'howto.shortcuts.add_link'|trans }}
    esc{{ 'howto.shortcuts.hide_form'|trans }}
    ← →{{ 'howto.shortcuts.arrows_navigation'|trans }}
    enter{{ 'howto.shortcuts.open_article'|trans }}
    diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/quickstart.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Static/quickstart.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig b/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/new_form.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig rename to src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/layout.html.twig similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig rename to src/Wallabag/CoreBundle/Resources/views/layout.html.twig diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/screenshot.jpg b/src/Wallabag/CoreBundle/Resources/views/screenshot.jpg similarity index 100% rename from src/Wallabag/CoreBundle/Resources/views/themes/material/screenshot.jpg rename to src/Wallabag/CoreBundle/Resources/views/screenshot.jpg diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Mail/forgotPassword.txt.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Mail/forgotPassword.txt.twig deleted file mode 100644 index 00fd292d8..000000000 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Mail/forgotPassword.txt.twig +++ /dev/null @@ -1,6 +0,0 @@ -Hello {{ username }}! - -To reset your password - please visit {{ confirmationUrl }} - -Regards, -Wallabag bot diff --git a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php index cf474f069..08010619c 100644 --- a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php +++ b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php @@ -16,7 +16,6 @@ use Wallabag\CoreBundle\Entity\Config; class CreateConfigListener implements EventSubscriberInterface { private $em; - private $theme; private $itemsOnPage; private $feedLimit; private $language; @@ -25,10 +24,9 @@ class CreateConfigListener implements EventSubscriberInterface private $listMode; private $session; - public function __construct(EntityManagerInterface $em, $theme, $itemsOnPage, $feedLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode, SessionInterface $session) + public function __construct(EntityManagerInterface $em, $itemsOnPage, $feedLimit, $language, $readingSpeed, $actionMarkAsRead, $listMode, SessionInterface $session) { $this->em = $em; - $this->theme = $theme; $this->itemsOnPage = $itemsOnPage; $this->feedLimit = $feedLimit; $this->language = $language; @@ -52,7 +50,6 @@ class CreateConfigListener implements EventSubscriberInterface public function createConfig(UserEvent $event) { $config = new Config($event->getUser()); - $config->setTheme($this->theme); $config->setItemsPerPage($this->itemsOnPage); $config->setFeedLimit($this->feedLimit); $config->setLanguage($this->session->get('_locale', $this->language)); diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php index 50a63a54f..3a5450148 100644 --- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php @@ -55,7 +55,6 @@ class ConfigControllerTest extends WallabagCoreTestCase $form = $crawler->filter('button[id=config_save]')->form(); $data = [ - 'config[theme]' => 'material', 'config[items_per_page]' => '30', 'config[reading_speed]' => '100', 'config[action_mark_as_read]' => '0', @@ -120,7 +119,6 @@ class ConfigControllerTest extends WallabagCoreTestCase { return [ [[ - 'config[theme]' => 'material', 'config[items_per_page]' => '', 'config[language]' => 'en', ]], @@ -837,7 +835,6 @@ class ConfigControllerTest extends WallabagCoreTestCase $config = new ConfigEntity($user); - $config->setTheme('material'); $config->setItemsPerPage(30); $config->setReadingSpeed(200); $config->setLanguage('en'); diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php index a46281e58..b1fd3b026 100644 --- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php +++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php @@ -86,7 +86,6 @@ class EntryControllerTest extends WallabagCoreTestCase public function testGetNew() { $this->logInAs('admin'); - $this->useTheme('material'); $client = $this->getClient(); $crawler = $client->request('GET', '/new'); diff --git a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php index 57a46dc14..22b9480d0 100644 --- a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php +++ b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php @@ -41,7 +41,6 @@ class RedirectTest extends TestCase $user->addRole('ROLE_SUPER_ADMIN'); $config = new Config($user); - $config->setTheme('material'); $config->setItemsPerPage(30); $config->setReadingSpeed(200); $config->setLanguage('en'); diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php index 4098eb116..e8e14f4b5 100644 --- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php +++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php @@ -11,7 +11,6 @@ use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\NullOutput; use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; -use Wallabag\CoreBundle\Entity\Config; use Wallabag\UserBundle\Entity\User; abstract class WallabagCoreTestCase extends WebTestCase @@ -152,14 +151,6 @@ abstract class WallabagCoreTestCase extends WebTestCase return $this->getLoggedInUser()->getId(); } - public function useTheme($theme) - { - $config = $this->getEntityManager()->getRepository(Config::class)->findOneByUser($this->getLoggedInUser()); - $config->setTheme($theme); - $this->getEntityManager()->persist($config); - $this->getEntityManager()->flush(); - } - /** * Check if Redis is installed. * If not, mark test as skip. diff --git a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php index 11933b6ce..9a5d950b7 100644 --- a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php +++ b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php @@ -32,7 +32,6 @@ class CreateConfigListenerTest extends TestCase $this->listener = new CreateConfigListener( $this->em, - 'material', 20, 50, 'fr', @@ -61,7 +60,6 @@ class CreateConfigListenerTest extends TestCase ); $config = new Config($user); - $config->setTheme('material'); $config->setItemsPerPage(20); $config->setFeedLimit(50); $config->setLanguage('fr');