From: Nik Okuntseff Date: Mon, 2 Apr 2018 00:34:26 +0000 (+0000) Subject: A bit more progress with renaming. X-Git-Tag: timetracker_1.19-1~892 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=167e70e68597a70269edea5c5af9b186c489d57f;p=timetracker.git A bit more progress with renaming. --- diff --git a/WEB-INF/lib/ttAdmin.class.php b/WEB-INF/lib/ttAdmin.class.php index 83b93a76..f9b12c86 100644 --- a/WEB-INF/lib/ttAdmin.class.php +++ b/WEB-INF/lib/ttAdmin.class.php @@ -189,7 +189,7 @@ class ttAdmin { $result = true; if (!ttValidString($fields['group_name'], true)) { - $this->err->add($i18n->get('error.field'), $i18n->get('label.team_name')); + $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name')); $result = false; } if (!ttValidString($fields['user_name'])) { diff --git a/WEB-INF/lib/ttRegistrator.class.php b/WEB-INF/lib/ttRegistrator.class.php index a82ebd3f..6a2142b5 100644 --- a/WEB-INF/lib/ttRegistrator.class.php +++ b/WEB-INF/lib/ttRegistrator.class.php @@ -62,7 +62,7 @@ class ttRegistrator { global $i18n; if (!ttValidString($this->group_name, true)) - $this->err->add($i18n->get('error.field'), $i18n->get('label.team_name')); + $this->err->add($i18n->get('error.field'), $i18n->get('label.group_name')); if (!ttValidString($this->currency, true)) $this->err->add($i18n->get('error.field'), $i18n->get('label.currency')); if (!ttValidString($this->user_name)) diff --git a/WEB-INF/resources/ca.lang.php b/WEB-INF/resources/ca.lang.php index 91d25b1a..b4654459 100644 --- a/WEB-INF/resources/ca.lang.php +++ b/WEB-INF/resources/ca.lang.php @@ -139,7 +139,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => 'Moneda', // TODO: translate the following. diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php index 51fa5030..74969240 100644 --- a/WEB-INF/resources/cs.lang.php +++ b/WEB-INF/resources/cs.lang.php @@ -141,7 +141,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => 'Měna', // TODO: translate the following. diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index 89603219..af784cb6 100644 --- a/WEB-INF/resources/da.lang.php +++ b/WEB-INF/resources/da.lang.php @@ -126,7 +126,7 @@ $i18n_key_words = array( 'button.stop' => 'Stop', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Team navn', +'label.group_name' => 'Team navn', // TODO: replace "team" with "group". 'label.address' => 'Adresse', 'label.currency' => 'Valuta', 'label.manager_name' => 'Manager navn', diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index 6b6228fe..0c1d5d72 100644 --- a/WEB-INF/resources/de.lang.php +++ b/WEB-INF/resources/de.lang.php @@ -126,7 +126,7 @@ $i18n_key_words = array( 'button.stop' => 'Stop', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Teamname', +'label.group_name' => 'Teamname', // TODO: replace "team" with "group". 'label.address' => 'Adresse', 'label.currency' => 'Währung', 'label.manager_name' => 'Manager Name', diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index 45062eb1..e487a574 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -120,7 +120,7 @@ $i18n_key_words = array( 'button.stop' => 'Stop', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Team name', +'label.group_name' => 'Group name', 'label.address' => 'Address', 'label.currency' => 'Currency', 'label.manager_name' => 'Manager name', diff --git a/WEB-INF/resources/es.lang.php b/WEB-INF/resources/es.lang.php index dcf3bfc6..d2e3d6d3 100644 --- a/WEB-INF/resources/es.lang.php +++ b/WEB-INF/resources/es.lang.php @@ -138,7 +138,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', 'label.address' => 'Dirección', 'label.currency' => 'Moneda', // TODO: translate the following. diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php index f7f800ce..71ebe74a 100644 --- a/WEB-INF/resources/et.lang.php +++ b/WEB-INF/resources/et.lang.php @@ -141,7 +141,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => 'Valuuta', // TODO: translate the following. diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php index e629d8d9..58bb44ec 100644 --- a/WEB-INF/resources/fa.lang.php +++ b/WEB-INF/resources/fa.lang.php @@ -134,7 +134,7 @@ $i18n_key_words = array( 'button.stop' => 'توقف', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'نام تیم', +'label.group_name' => 'نام تیم', // TODO: replace "team" with "group". 'label.address' => 'آدرس', 'label.currency' => 'واحد پول', 'label.manager_name' => 'نام مدیر', diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index b90e0ce1..3afb8646 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -128,7 +128,7 @@ $i18n_key_words = array( 'button.stop' => 'Lopeta', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Tiimin nimi', +'label.group_name' => 'Tiimin nimi', // TODO: replace "team" with "group". 'label.address' => 'Osoite', 'label.currency' => 'Valuutta', 'label.manager_name' => 'Esimies', diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php index 92b1b6c9..f17a36c8 100644 --- a/WEB-INF/resources/fr.lang.php +++ b/WEB-INF/resources/fr.lang.php @@ -126,7 +126,7 @@ $i18n_key_words = array( 'button.stop' => 'Arrêter', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Nom équipe', +'label.group_name' => 'Nom équipe', // TODO: replace "team" with "group". 'label.address' => 'Adresse', 'label.currency' => 'Devise', 'label.manager_name' => 'Nom du responsable', diff --git a/WEB-INF/resources/gr.lang.php b/WEB-INF/resources/gr.lang.php index 67041209..a4ad2cbf 100644 --- a/WEB-INF/resources/gr.lang.php +++ b/WEB-INF/resources/gr.lang.php @@ -120,7 +120,7 @@ $i18n_key_words = array( 'button.stop' => 'Τέλος', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Όνομα ομάδας', +'label.group_name' => 'Όνομα ομάδας', 'label.address' => 'Διεύθυνση', 'label.currency' => 'Νόμισμα', 'label.manager_name' => 'Όνομα διαχειριστή', diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php index e83a42b6..a0931aee 100644 --- a/WEB-INF/resources/he.lang.php +++ b/WEB-INF/resources/he.lang.php @@ -144,7 +144,7 @@ $i18n_key_words = array( 'button.stop' => 'עצור', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'שם הצוות', +'label.group_name' => 'שם הצוות', // TODO: replace "team" with "group". 'label.address' => 'כתובת', 'label.currency' => 'מטבע', 'label.manager_name' => 'שם של המנהל', diff --git a/WEB-INF/resources/hu.lang.php b/WEB-INF/resources/hu.lang.php index 90b14ffc..81d336e8 100644 --- a/WEB-INF/resources/hu.lang.php +++ b/WEB-INF/resources/hu.lang.php @@ -138,7 +138,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => 'Pénznem', // TODO: translate the following. diff --git a/WEB-INF/resources/it.lang.php b/WEB-INF/resources/it.lang.php index a7980b21..8d91f452 100644 --- a/WEB-INF/resources/it.lang.php +++ b/WEB-INF/resources/it.lang.php @@ -124,7 +124,7 @@ $i18n_key_words = array( 'button.stop' => 'Stop', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Nome del gruppo', +'label.group_name' => 'Nome del gruppo', 'label.address' => 'Indirizzo', 'label.currency' => 'Moneta', 'label.manager_name' => 'Nome manager', diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index 1ba547cf..02bb66f9 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -143,7 +143,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => '通貨', // TODO: translate the following. diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index 1b14e06e..48e17d8d 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -142,7 +142,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => '화폐', // TODO: translate the following. diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php index 69fc06e4..ca7e5407 100644 --- a/WEB-INF/resources/nl.lang.php +++ b/WEB-INF/resources/nl.lang.php @@ -119,7 +119,7 @@ $i18n_key_words = array( 'button.stop' => 'Stop', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Teamnaam', +'label.group_name' => 'Teamnaam', // TODO: replace "team" with "group". 'label.address' => 'Adres', 'label.currency' => 'Munteenheid', 'label.manager_name' => 'Naam van de manager', diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index cca996ea..2fd41c85 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -142,7 +142,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => 'Valuta', // TODO: translate the following. diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php index fe3ba97a..da6d2af7 100644 --- a/WEB-INF/resources/pl.lang.php +++ b/WEB-INF/resources/pl.lang.php @@ -130,7 +130,7 @@ $i18n_key_words = array( 'button.stop' => 'Zatrzymaj', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Nazwa zespołu', +'label.group_name' => 'Nazwa zespołu', // TODO: replace "team" with "group". 'label.address' => 'Adres', 'label.currency' => 'Waluta', 'label.manager_name' => 'Nazwa managera', diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php index cb07cfdf..357afad9 100644 --- a/WEB-INF/resources/pt-br.lang.php +++ b/WEB-INF/resources/pt-br.lang.php @@ -127,7 +127,7 @@ $i18n_key_words = array( 'button.stop' => 'Parar', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Nome da equipe', +'label.group_name' => 'Nome da equipe', // TODO: replace "team" with "group". 'label.address' => 'Endereço', 'label.currency' => 'Moeda', 'label.manager_name' => 'Nome do gerente', diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index e8b83a6e..09448018 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -136,7 +136,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', // 'label.currency' => 'Currency', // 'label.manager_name' => 'Manager name', diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index 00f0e742..d2e66162 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -144,7 +144,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => 'Moneda', // TODO: translate the following. diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index 56dca815..72264251 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -119,7 +119,7 @@ $i18n_key_words = array( 'button.stop' => 'Завершить', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Название команды', +'label.group_name' => 'Название группы', 'label.address' => 'Адрес', 'label.currency' => 'Валюта', 'label.manager_name' => 'Имя менеджера', diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php index 593ce1e0..3f38b378 100644 --- a/WEB-INF/resources/sk.lang.php +++ b/WEB-INF/resources/sk.lang.php @@ -135,7 +135,7 @@ $i18n_key_words = array( // 'button.stop' => 'Stop', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Názov tímu', +'label.group_name' => 'Názov tímu', // TODO: replace "team" with "group". 'label.address' => 'Adresa', 'label.currency' => 'Mena', 'label.manager_name' => 'Meno manažéra', diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php index 5f0543fa..7c961726 100644 --- a/WEB-INF/resources/sl.lang.php +++ b/WEB-INF/resources/sl.lang.php @@ -133,7 +133,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', // 'label.currency' => 'Currency', // 'label.manager_name' => 'Manager name', diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php index c8c3debf..4fb0d0d1 100644 --- a/WEB-INF/resources/sr.lang.php +++ b/WEB-INF/resources/sr.lang.php @@ -127,7 +127,7 @@ $i18n_key_words = array( 'button.stop' => 'Stani', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Naziv tim-a', +'label.group_name' => 'Naziv tim-a', // TODO: replace "team" with "group". 'label.address' => 'Adresa', 'label.currency' => 'Valuta', 'label.manager_name' => 'Ime Menadžera', diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php index c802f013..658871f4 100644 --- a/WEB-INF/resources/sv.lang.php +++ b/WEB-INF/resources/sv.lang.php @@ -124,7 +124,7 @@ $i18n_key_words = array( 'button.stop' => 'Avsluta', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => 'Namn på arbetsgrupp', +'label.group_name' => 'Namn på grupp', 'label.address' => 'Adress', 'label.currency' => 'Valuta', 'label.manager_name' => 'Namn på ansvarig', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index 1fe6a609..4c4604ba 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -148,7 +148,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => 'Para birimi', // TODO: translate the following. diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index 71325b5c..716099be 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -133,7 +133,7 @@ $i18n_key_words = array( // 'button.stop' => 'Stop', // Labels for controls on forms. Labels in this section are used on multiple forms. -'label.team_name' => '团队名称', +'label.group_name' => '团队名称', // TODO: replace "team" with "group". // TODO: translate the following. // 'label.address' => 'Address', 'label.currency' => '货币', diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index a8277d2d..6384c0d4 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -139,7 +139,7 @@ $i18n_key_words = array( // Labels for controls on forms. Labels in this section are used on multiple forms. // TODO: translate the following. -// 'label.team_name' => 'Team name', +// 'label.group_name' => 'Group name', // 'label.address' => 'Address', 'label.currency' => '貨幣', // TODO: translate the following. diff --git a/WEB-INF/templates/admin_team_add.tpl b/WEB-INF/templates/admin_team_add.tpl index 97cd94da..364b599b 100644 --- a/WEB-INF/templates/admin_team_add.tpl +++ b/WEB-INF/templates/admin_team_add.tpl @@ -4,7 +4,7 @@ - + diff --git a/WEB-INF/templates/admin_team_edit.tpl b/WEB-INF/templates/admin_team_edit.tpl index 09804922..fb792045 100644 --- a/WEB-INF/templates/admin_team_edit.tpl +++ b/WEB-INF/templates/admin_team_edit.tpl @@ -4,7 +4,7 @@
{$i18n.label.team_name}:{$i18n.label.group_name}: {$forms.teamForm.team_name.control}
- + diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 5e706052..f6ce46f9 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
{$i18n.label.team_name}:{$i18n.label.group_name}: {$forms.teamForm.team_name.control}
 
-
 Anuko Time Tracker 1.17.85.4214 | Copyright © Anuko | +  Anuko Time Tracker 1.17.85.4215 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/group_edit.tpl b/WEB-INF/templates/group_edit.tpl index 4dedafdf..5a5711b0 100644 --- a/WEB-INF/templates/group_edit.tpl +++ b/WEB-INF/templates/group_edit.tpl @@ -104,7 +104,7 @@ function handlePluginCheckboxes() { {if $user->isManager() || ($user->canManageTeam() && !defined(MANAGER_ONLY_TEAM_SETTINGS))} - + diff --git a/WEB-INF/templates/register.tpl b/WEB-INF/templates/register.tpl index bc77a6a4..49fd2267 100644 --- a/WEB-INF/templates/register.tpl +++ b/WEB-INF/templates/register.tpl @@ -4,7 +4,7 @@
{$i18n.label.team_name}:{$i18n.label.group_name}: {$forms.groupForm.team_name.control}
- + diff --git a/group_edit.php b/group_edit.php index 128365f3..eb6995a5 100644 --- a/group_edit.php +++ b/group_edit.php @@ -210,7 +210,7 @@ $form->addInput(array('type'=>'submit','name'=>'btn_save','value'=>$i18n->get('b if ($request->isPost()) { // Validate user input. - if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.team_name')); + if (!ttValidString($cl_team, true)) $err->add($i18n->get('error.field'), $i18n->get('label.group_name')); if (!ttValidString($cl_currency, true)) $err->add($i18n->get('error.field'), $i18n->get('label.currency')); if ($user->can('manage_advanced_settings')) { if (!ttValidEmail($cl_bcc_email, true)) $err->add($i18n->get('error.field'), $i18n->get('label.bcc'));
{$i18n.label.team_name}:{$i18n.label.group_name}: {$forms.profileForm.team_name.control}