diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-09 08:59:08 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-20 21:12:22 +0100 |
commit | 0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc (patch) | |
tree | 4cf8b97ed3c06def270e9172c7b17c5c86048585 /src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |
parent | d2b4f01d7435e8a8f99b15a2487916427c04e58d (diff) | |
download | wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.gz wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.tar.zst wallabag-0d42217e4e8210dd2cf86f35ba9662ca02c8a2dc.zip |
Convert english translation file
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
Diffstat (limited to 'src/Wallabag/CoreBundle/Form/Type/ConfigType.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Form/Type/ConfigType.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php index 0a5ea6cc..25ea9efa 100644 --- a/src/Wallabag/CoreBundle/Form/Type/ConfigType.php +++ b/src/Wallabag/CoreBundle/Form/Type/ConfigType.php | |||
@@ -33,9 +33,13 @@ class ConfigType extends AbstractType | |||
33 | ->add('theme', ChoiceType::class, array( | 33 | ->add('theme', ChoiceType::class, array( |
34 | 'choices' => array_flip($this->themes), | 34 | 'choices' => array_flip($this->themes), |
35 | 'choices_as_values' => true, | 35 | 'choices_as_values' => true, |
36 | 'label' => 'config.form_settings.theme_label', | ||
37 | )) | ||
38 | ->add('items_per_page', null, array( | ||
39 | 'label' => 'config.form_settings.items_per_page_label', | ||
36 | )) | 40 | )) |
37 | ->add('items_per_page') | ||
38 | ->add('reading_speed', ChoiceType::class, array( | 41 | ->add('reading_speed', ChoiceType::class, array( |
42 | 'label' => 'config.form_settings.reading_speed', | ||
39 | 'choices' => array( | 43 | 'choices' => array( |
40 | 'I read ~100 words per minute' => '0.5', | 44 | 'I read ~100 words per minute' => '0.5', |
41 | 'I read ~200 words per minute' => '1', | 45 | 'I read ~200 words per minute' => '1', |
@@ -46,8 +50,11 @@ class ConfigType extends AbstractType | |||
46 | ->add('language', ChoiceType::class, array( | 50 | ->add('language', ChoiceType::class, array( |
47 | 'choices' => array_flip($this->languages), | 51 | 'choices' => array_flip($this->languages), |
48 | 'choices_as_values' => true, | 52 | 'choices_as_values' => true, |
53 | 'label' => 'config.form_settings.language_label', | ||
54 | )) | ||
55 | ->add('save', SubmitType::class, array( | ||
56 | 'label' => 'config.form.save', | ||
49 | )) | 57 | )) |
50 | ->add('save', SubmitType::class) | ||
51 | ; | 58 | ; |
52 | } | 59 | } |
53 | 60 | ||