From 843cd8fb6797ceab75c08f00f59471c97f8e7541 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Wed, 13 Oct 2021 13:37:44 +0200 Subject: [PATCH] refactor system configuration title and wording (#2847) --- .../SystemConfigurationController.php | 34 +++++++++++-------- src/Form/Model/SystemConfiguration.php | 4 +-- .../system-configuration/index.html.twig | 6 +++- .../SystemConfigurationControllerTest.php | 24 ++++++------- translations/messages.de.xlf | 6 +++- translations/messages.en.xlf | 6 +++- translations/system-configuration.ar.xlf | 8 ----- translations/system-configuration.cs.xlf | 8 ----- translations/system-configuration.da.xlf | 8 ----- translations/system-configuration.de.xlf | 8 ----- translations/system-configuration.el.xlf | 8 ----- translations/system-configuration.en.xlf | 8 ----- translations/system-configuration.eo.xlf | 8 ----- translations/system-configuration.es.xlf | 8 ----- translations/system-configuration.eu.xlf | 8 ----- translations/system-configuration.fi.xlf | 8 ----- translations/system-configuration.fr.xlf | 8 ----- translations/system-configuration.he.xlf | 8 ----- translations/system-configuration.hr.xlf | 8 ----- translations/system-configuration.hu.xlf | 8 ----- translations/system-configuration.it.xlf | 8 ----- translations/system-configuration.ja.xlf | 4 --- translations/system-configuration.ko.xlf | 8 ----- translations/system-configuration.nl.xlf | 8 ----- translations/system-configuration.pl.xlf | 8 ----- translations/system-configuration.pt.xlf | 8 ----- translations/system-configuration.pt_BR.xlf | 8 ----- translations/system-configuration.ro.xlf | 8 ----- translations/system-configuration.ru.xlf | 8 ----- translations/system-configuration.sk.xlf | 8 ----- translations/system-configuration.sv.xlf | 8 ----- translations/system-configuration.tr.xlf | 8 ----- translations/system-configuration.vi.xlf | 8 ----- translations/system-configuration.zh_CN.xlf | 8 ----- 34 files changed, 48 insertions(+), 252 deletions(-) diff --git a/src/Controller/SystemConfigurationController.php b/src/Controller/SystemConfigurationController.php index bbf48d19..270ac554 100644 --- a/src/Controller/SystemConfigurationController.php +++ b/src/Controller/SystemConfigurationController.php @@ -449,11 +449,12 @@ final class SystemConfigurationController extends AbstractController (new SystemConfigurationModel()) ->setSection(SystemConfigurationModel::SECTION_FORM_INVOICE) ->setConfiguration([ + // TODO that should be a custom type with validation (new Configuration()) ->setName('invoice.number_format') ->setLabel('invoice.number_format') ->setRequired(true) - ->setType(TextType::class) // TODO that should be a custom type with validation + ->setType(TextType::class) ->setTranslationDomain('system-configuration'), (new Configuration()) ->setName('invoice.simple_form') @@ -470,15 +471,18 @@ final class SystemConfigurationController extends AbstractController ->setName('defaults.customer.timezone') ->setLabel('timezone') ->setType(TimezoneType::class) - ->setValue(date_default_timezone_get()), + ->setValue(date_default_timezone_get()) + ->setOptions(['help' => 'default_value_new']), (new Configuration()) ->setName('defaults.customer.country') ->setLabel('country') - ->setType(CountryType::class), + ->setType(CountryType::class) + ->setOptions(['help' => 'default_value_new']), (new Configuration()) ->setName('defaults.customer.currency') ->setLabel('currency') - ->setType(CurrencyType::class), + ->setType(CurrencyType::class) + ->setOptions(['help' => 'default_value_new']), ]), (new SystemConfigurationModel()) ->setSection(SystemConfigurationModel::SECTION_FORM_USER) @@ -487,19 +491,28 @@ final class SystemConfigurationController extends AbstractController ->setName('defaults.user.timezone') ->setLabel('timezone') ->setType(TimezoneType::class) - ->setValue(date_default_timezone_get()), + ->setValue(date_default_timezone_get()) + ->setOptions(['help' => 'default_value_new']), (new Configuration()) ->setName('defaults.user.language') ->setLabel('language') - ->setType(LanguageType::class), + ->setType(LanguageType::class) + ->setOptions(['help' => 'default_value_new']), (new Configuration()) ->setName('defaults.user.theme') ->setLabel('skin') - ->setType(SkinType::class), + ->setType(SkinType::class) + ->setOptions(['help' => 'default_value_new']), (new Configuration()) ->setName('defaults.user.currency') ->setLabel('currency') ->setType(CurrencyType::class), + (new Configuration()) + ->setName('theme.avatar_url') + ->setRequired(false) + ->setLabel('theme.avatar_url') + ->setType(CheckboxType::class) + ->setTranslationDomain('system-configuration'), ]), (new SystemConfigurationModel()) ->setSection(SystemConfigurationModel::SECTION_THEME) @@ -532,13 +545,6 @@ final class SystemConfigurationController extends AbstractController ->setOptions(['help' => 'help.theme.color_choices']) ->setConstraints([new ColorChoices()]) ->setTranslationDomain('system-configuration'), - // allow avatar URLs - (new Configuration()) - ->setName('theme.avatar_url') - ->setRequired(false) - ->setLabel('theme.avatar_url') - ->setType(CheckboxType::class) - ->setTranslationDomain('system-configuration'), // random colors as fallback (new Configuration()) ->setName('theme.random_colors') diff --git a/src/Form/Model/SystemConfiguration.php b/src/Form/Model/SystemConfiguration.php index a1ae7ad0..77428062 100644 --- a/src/Form/Model/SystemConfiguration.php +++ b/src/Form/Model/SystemConfiguration.php @@ -15,8 +15,8 @@ class SystemConfiguration public const SECTION_LOCKDOWN = 'lockdown_period'; public const SECTION_TIMESHEET = 'timesheet'; public const SECTION_FORM_INVOICE = 'invoice'; - public const SECTION_FORM_CUSTOMER = 'form_customer'; - public const SECTION_FORM_USER = 'form_user'; + public const SECTION_FORM_CUSTOMER = 'customer'; + public const SECTION_FORM_USER = 'user'; public const SECTION_THEME = 'theme'; public const SECTION_AUTHENTICATION = 'authentication'; public const SECTION_CALENDAR = 'calendar'; diff --git a/templates/system-configuration/index.html.twig b/templates/system-configuration/index.html.twig index dccc9d3c..a5446537 100644 --- a/templates/system-configuration/index.html.twig +++ b/templates/system-configuration/index.html.twig @@ -9,8 +9,12 @@ {% set formEditTemplate = app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %} {% for section in sections %} + {% set title = section.model.section|trans({}, 'system-configuration') %} + {% if title == section.model.section %} + {% set title = ('label.' ~ section.model.section)|trans %} + {% endif %} {{ include(formEditTemplate, { - 'title': section.model.section|trans({}, 'system-configuration'), + 'title': title, 'form': section.form, }) }} {% endfor %} diff --git a/tests/Controller/SystemConfigurationControllerTest.php b/tests/Controller/SystemConfigurationControllerTest.php index 25b939ca..48123f59 100644 --- a/tests/Controller/SystemConfigurationControllerTest.php +++ b/tests/Controller/SystemConfigurationControllerTest.php @@ -54,8 +54,6 @@ class SystemConfigurationControllerTest extends ControllerBaseTest $client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN); $this->assertAccessIsGranted($client, '/admin/system-config/edit/timesheet'); - $expectedForms = $this->getTestDataForms(); - $result = $client->getCrawler()->filter('section.content div.box.box-primary'); $this->assertEquals(1, \count($result)); @@ -76,8 +74,8 @@ class SystemConfigurationControllerTest extends ControllerBaseTest ['form[name=system_configuration_form_invoice]', $this->createUrl('/admin/system-config/update/invoice')], ['form[name=system_configuration_form_authentication]', $this->createUrl('/admin/system-config/update/authentication')], ['form[name=system_configuration_form_rounding]', $this->createUrl('/admin/system-config/update/rounding')], - ['form[name=system_configuration_form_form_customer]', $this->createUrl('/admin/system-config/update/form_customer')], - ['form[name=system_configuration_form_form_user]', $this->createUrl('/admin/system-config/update/form_user')], + ['form[name=system_configuration_form_customer]', $this->createUrl('/admin/system-config/update/customer')], + ['form[name=system_configuration_form_user]', $this->createUrl('/admin/system-config/update/user')], ['form[name=system_configuration_form_theme]', $this->createUrl('/admin/system-config/update/theme')], ['form[name=system_configuration_form_calendar]', $this->createUrl('/admin/system-config/update/calendar')], ['form[name=system_configuration_form_branding]', $this->createUrl('/admin/system-config/update/branding')], @@ -191,9 +189,9 @@ class SystemConfigurationControllerTest extends ControllerBaseTest $this->assertEquals('DE', $configService->find('defaults.customer.country')); $this->assertEquals('EUR', $configService->find('defaults.customer.currency')); - $form = $client->getCrawler()->filter('form[name=system_configuration_form_form_customer]')->form(); + $form = $client->getCrawler()->filter('form[name=system_configuration_form_customer]')->form(); $client->submit($form, [ - 'system_configuration_form_form_customer' => [ + 'system_configuration_form_customer' => [ 'configuration' => [ ['name' => 'defaults.customer.timezone', 'value' => 'Atlantic/Canary'], ['name' => 'defaults.customer.country', 'value' => 'BB'], @@ -223,9 +221,9 @@ class SystemConfigurationControllerTest extends ControllerBaseTest $this->assertNull($configService->find('defaults.user.theme')); $this->assertEquals('en', $configService->find('defaults.user.language')); - $form = $client->getCrawler()->filter('form[name=system_configuration_form_form_user]')->form(); + $form = $client->getCrawler()->filter('form[name=system_configuration_form_user]')->form(); $client->submit($form, [ - 'system_configuration_form_form_user' => [ + 'system_configuration_form_user' => [ 'configuration' => [ ['name' => 'defaults.user.timezone', 'value' => 'Pacific/Tahiti'], ['name' => 'defaults.user.language', 'value' => 'ru'], @@ -250,9 +248,9 @@ class SystemConfigurationControllerTest extends ControllerBaseTest $this->assertFormHasValidationError( User::ROLE_SUPER_ADMIN, '/admin/system-config/', - 'form[name=system_configuration_form_form_customer]', + 'form[name=system_configuration_form_customer]', [ - 'system_configuration_form_form_customer' => [ + 'system_configuration_form_customer' => [ 'configuration' => [ ['name' => 'defaults.customer.timezone', 'value' => 'XX'], ['name' => 'defaults.customer.country', 'value' => 1], @@ -261,9 +259,9 @@ class SystemConfigurationControllerTest extends ControllerBaseTest ] ], [ - '#system_configuration_form_form_customer_configuration_0_value', - '#system_configuration_form_form_customer_configuration_1_value', - '#system_configuration_form_form_customer_configuration_2_value', + '#system_configuration_form_customer_configuration_0_value', + '#system_configuration_form_customer_configuration_1_value', + '#system_configuration_form_customer_configuration_2_value', ], true ); diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf index a11fa6ec..f77f50f8 100644 --- a/translations/messages.de.xlf +++ b/translations/messages.de.xlf @@ -725,7 +725,7 @@ label.avatar - Profilbild + Profilbild (URL) label.active @@ -1252,6 +1252,10 @@ team.add_user.help Durch Auswahl wird dem Team ein neuer Benutzer hinzugefügt. Sie können im Anschluss festlegen, ob der Benutzer ein Teamleiter sein soll. + + default_value_new + Standard Wert für neue Einträge + diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf index 3f0c6db4..4cea6cd8 100644 --- a/translations/messages.en.xlf +++ b/translations/messages.en.xlf @@ -725,7 +725,7 @@ label.avatar - Profile image + Profile image (URL) label.active @@ -1252,6 +1252,10 @@ team.add_user.help Add a new user to the team by selecting it from the list. Afterwards you can decide if the user should become a teamlead. + + default_value_new + Default values for new entries + diff --git a/translations/system-configuration.ar.xlf b/translations/system-configuration.ar.xlf index 8b39a313..8a26733d 100644 --- a/translations/system-configuration.ar.xlf +++ b/translations/system-configuration.ar.xlf @@ -14,14 +14,6 @@ invoice الفواتير - - form_customer - إنشاء العميل — القيم الافتراضية - - - form_user - المستخدم — القيم الافتراضية - theme موضوع diff --git a/translations/system-configuration.cs.xlf b/translations/system-configuration.cs.xlf index 78916834..02e23572 100644 --- a/translations/system-configuration.cs.xlf +++ b/translations/system-configuration.cs.xlf @@ -10,14 +10,6 @@ timesheet Pracovní výkaz - - form_customer - Vytvořit zákazníka—výchozí hodnota - - - form_user - Uživatel—výchozí hodnota - theme Vzhled diff --git a/translations/system-configuration.da.xlf b/translations/system-configuration.da.xlf index b40bf2af..17df2d3d 100644 --- a/translations/system-configuration.da.xlf +++ b/translations/system-configuration.da.xlf @@ -10,14 +10,6 @@ timesheet Timeseddel - - form_customer - Opret standardværdier for kunder - - - form_user - Standardværdier for brugere - theme Tema diff --git a/translations/system-configuration.de.xlf b/translations/system-configuration.de.xlf index 15441103..72946966 100644 --- a/translations/system-configuration.de.xlf +++ b/translations/system-configuration.de.xlf @@ -14,14 +14,6 @@ invoice Rechnungen - - form_customer - Kunden anlegen - Standard Werte - - - form_user - Benutzer - Standard Werte - theme Darstellung diff --git a/translations/system-configuration.el.xlf b/translations/system-configuration.el.xlf index f7ad94f6..c31a4705 100644 --- a/translations/system-configuration.el.xlf +++ b/translations/system-configuration.el.xlf @@ -14,14 +14,6 @@ invoice Τιμολόγια - - form_customer - Δημιουργία πελάτη - προεπιλεγμένες τιμές - - - form_user - Χρήστης - προεπιλεγμένες τιμές - theme Θέμα diff --git a/translations/system-configuration.en.xlf b/translations/system-configuration.en.xlf index ad242733..ad189c7a 100644 --- a/translations/system-configuration.en.xlf +++ b/translations/system-configuration.en.xlf @@ -14,14 +14,6 @@ invoice Invoices - - form_customer - Create customer—default values - - - form_user - User—default values - theme Theme diff --git a/translations/system-configuration.eo.xlf b/translations/system-configuration.eo.xlf index 4e2d19a5..ab0a6e6c 100644 --- a/translations/system-configuration.eo.xlf +++ b/translations/system-configuration.eo.xlf @@ -14,14 +14,6 @@ invoice Fakturoj - - form_customer - Krei defaŭltajn valorojn de kliento - - - form_user - Defaŭltaj valoroj de uzanto - theme Etoso diff --git a/translations/system-configuration.es.xlf b/translations/system-configuration.es.xlf index 4f2a6d94..4b39b2fd 100644 --- a/translations/system-configuration.es.xlf +++ b/translations/system-configuration.es.xlf @@ -10,14 +10,6 @@ timesheet Parte de horas - - form_customer - Crear cliente. Valores predeterminados - - - form_user - Valores predeterminados. Usuario - theme Tema diff --git a/translations/system-configuration.eu.xlf b/translations/system-configuration.eu.xlf index 687ad802..ce10c09f 100644 --- a/translations/system-configuration.eu.xlf +++ b/translations/system-configuration.eu.xlf @@ -10,14 +10,6 @@ timesheet Ordu taula - - form_customer - Bezeroa sortu - defektuzko balioekin - - - form_user - Defektuzko balioak - erabiltzailea - theme Itxura diff --git a/translations/system-configuration.fi.xlf b/translations/system-configuration.fi.xlf index f010bbff..a1754809 100644 --- a/translations/system-configuration.fi.xlf +++ b/translations/system-configuration.fi.xlf @@ -14,14 +14,6 @@ invoice Laskut - - form_customer - Luo asiakas—oletus arvot - - - form_user - Käyttäjä—oletus arvot - theme Teema diff --git a/translations/system-configuration.fr.xlf b/translations/system-configuration.fr.xlf index f09a7f68..6bb6dbb8 100644 --- a/translations/system-configuration.fr.xlf +++ b/translations/system-configuration.fr.xlf @@ -10,10 +10,6 @@ timesheet Fiche de temps - - form_customer - Créer un client : Valeurs par défaut - theme Thème @@ -210,10 +206,6 @@ label.theme.tags_create Mots-clés : Utiliser la recherche avec auto-complétion et autoriser la création de mots-clés - - form_user - Utilisateur : Valeurs par défaut - invoice Factures diff --git a/translations/system-configuration.he.xlf b/translations/system-configuration.he.xlf index d563be94..1f7e2e7c 100644 --- a/translations/system-configuration.he.xlf +++ b/translations/system-configuration.he.xlf @@ -17,14 +17,6 @@ invoice חשבוניות - - form_customer - צור ערכי ברירת מחדל ללקוח - - - form_user - ערכי ברירת מחדל למשתמש - theme ערכת עיצוב diff --git a/translations/system-configuration.hr.xlf b/translations/system-configuration.hr.xlf index cf0393db..d0805690 100644 --- a/translations/system-configuration.hr.xlf +++ b/translations/system-configuration.hr.xlf @@ -18,14 +18,6 @@ invoice Računi - - form_customer - Stvori standardne vrijednosti za kupca - - - form_user - Standardne vrijednosti za korisnika - theme Tema diff --git a/translations/system-configuration.hu.xlf b/translations/system-configuration.hu.xlf index e73ec94a..f657b67f 100644 --- a/translations/system-configuration.hu.xlf +++ b/translations/system-configuration.hu.xlf @@ -10,10 +10,6 @@ timesheet Rögzített órák - - form_customer - Új ügyfél alapértelmezett értékei - label.timesheet.mode_duration_only "Csak időtartam" mód - a befejezés mezőt kicseréli időtartamra @@ -26,10 +22,6 @@ label.timesheet.active_entries.hard_limit Egyszerre futtatható rögzítések száma - - form_user - Felhasználó—alapértelmezett értékek - invoice Számlák diff --git a/translations/system-configuration.it.xlf b/translations/system-configuration.it.xlf index fa411bc6..051c4147 100644 --- a/translations/system-configuration.it.xlf +++ b/translations/system-configuration.it.xlf @@ -10,14 +10,6 @@ timesheet Scheda attività - - form_customer - Creazione clienti - valori di default - - - form_user - Valori utente di default - theme Tema diff --git a/translations/system-configuration.ja.xlf b/translations/system-configuration.ja.xlf index 4774bda3..f06d3af0 100644 --- a/translations/system-configuration.ja.xlf +++ b/translations/system-configuration.ja.xlf @@ -10,10 +10,6 @@ timesheet タイムシート - - form_customer - 得意先を追加する時のデフォルト値 - theme テーマ diff --git a/translations/system-configuration.ko.xlf b/translations/system-configuration.ko.xlf index 56a563d7..1a891259 100644 --- a/translations/system-configuration.ko.xlf +++ b/translations/system-configuration.ko.xlf @@ -10,14 +10,6 @@ timesheet 타임시트 - - form_customer - 고객 생성—기본 값 - - - form_user - 사용자—기본 값 - theme 테마 diff --git a/translations/system-configuration.nl.xlf b/translations/system-configuration.nl.xlf index c89cefa6..777f830d 100644 --- a/translations/system-configuration.nl.xlf +++ b/translations/system-configuration.nl.xlf @@ -14,14 +14,6 @@ invoice Facturen - - form_customer - Maak standaard klant waardens aan - - - form_user - Gebruiker—standaardwaarden - theme Thema diff --git a/translations/system-configuration.pl.xlf b/translations/system-configuration.pl.xlf index a33aa57b..26c609cd 100644 --- a/translations/system-configuration.pl.xlf +++ b/translations/system-configuration.pl.xlf @@ -10,14 +10,6 @@ timesheet Ewidencje - - form_customer - Utwórz ustawienia domyślne dla klientów - - - form_user - Ustawienia domyślne dla użytkowników - theme Kompozycja diff --git a/translations/system-configuration.pt.xlf b/translations/system-configuration.pt.xlf index 38163fbb..3c40c26e 100644 --- a/translations/system-configuration.pt.xlf +++ b/translations/system-configuration.pt.xlf @@ -10,14 +10,6 @@ timesheet Quadro de tempos - - form_customer - Criar cliente - valores padrão - - - form_user - Utilizador - valores padrão - theme Tema diff --git a/translations/system-configuration.pt_BR.xlf b/translations/system-configuration.pt_BR.xlf index 9b26ab60..0a720d1d 100644 --- a/translations/system-configuration.pt_BR.xlf +++ b/translations/system-configuration.pt_BR.xlf @@ -10,14 +10,6 @@ timesheet Horário - - form_customer - Criar cliente - Valores padrões - - - form_user - Usuário - Valores padrões - theme Tema diff --git a/translations/system-configuration.ro.xlf b/translations/system-configuration.ro.xlf index d120d8c5..66232aca 100644 --- a/translations/system-configuration.ro.xlf +++ b/translations/system-configuration.ro.xlf @@ -10,14 +10,6 @@ timesheet Pontaj - - form_customer - Creaza valorile implicite pentru client - - - form_user - Valori implicite pentru utilizator - theme Tema diff --git a/translations/system-configuration.ru.xlf b/translations/system-configuration.ru.xlf index a381b80c..11fb34d9 100644 --- a/translations/system-configuration.ru.xlf +++ b/translations/system-configuration.ru.xlf @@ -14,14 +14,6 @@ invoice Счета - - form_customer - Создать клиента — значения по умолчанию - - - form_user - Пользователь — значения по умолчанию - theme Тема diff --git a/translations/system-configuration.sk.xlf b/translations/system-configuration.sk.xlf index c911e2a4..240a1058 100644 --- a/translations/system-configuration.sk.xlf +++ b/translations/system-configuration.sk.xlf @@ -10,10 +10,6 @@ timesheet Pracovný výkaz - - form_customer - Vytvorte predvolené hodnoty zákazníka - label.timesheet.markdown_content Povoliť Markdown v popisoch časového rozvrhu @@ -190,10 +186,6 @@ theme Vzhľad - - form_user - Užívateľ-východzie nastavenia - invoice Faktúry diff --git a/translations/system-configuration.sv.xlf b/translations/system-configuration.sv.xlf index b86199b8..79eeb8ec 100644 --- a/translations/system-configuration.sv.xlf +++ b/translations/system-configuration.sv.xlf @@ -10,10 +10,6 @@ timesheet Tidrapport - - form_customer - Skapa kund - standardvärden - theme Tema @@ -258,10 +254,6 @@ label.theme.tags_create Taggar: använd automatisk komplettering vid sökning och tillåt skapande av taggar - - form_user - Användare – standardvärden - invoice Fakturor diff --git a/translations/system-configuration.tr.xlf b/translations/system-configuration.tr.xlf index 329f0bf4..7233303c 100644 --- a/translations/system-configuration.tr.xlf +++ b/translations/system-configuration.tr.xlf @@ -10,14 +10,6 @@ timesheet Zaman çizelgesi - - form_customer - Müşteri oluştur—öntanımlı değerler - - - form_user - Kullanıcı—öntanımlı değerler - theme Tema diff --git a/translations/system-configuration.vi.xlf b/translations/system-configuration.vi.xlf index dc336023..6fbd554f 100644 --- a/translations/system-configuration.vi.xlf +++ b/translations/system-configuration.vi.xlf @@ -14,14 +14,6 @@ invoice Hóa đơn - - form_customer - Tạo giá trị mặc định của khách hàng - - - form_user - Giá trị mặc định của người dùng - theme Chủ đề diff --git a/translations/system-configuration.zh_CN.xlf b/translations/system-configuration.zh_CN.xlf index f78c7b4a..875d72c6 100644 --- a/translations/system-configuration.zh_CN.xlf +++ b/translations/system-configuration.zh_CN.xlf @@ -10,14 +10,6 @@ timesheet 时间表 - - form_customer - 创建客户-默认值 - - - form_user - 用户—默认值 - theme 主题