From 744db7fd043608e864f3db7c9cd1fe7efc55205e Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Fri, 6 Apr 2018 11:44:54 +0000 Subject: [PATCH] Some more refactoring. --- WEB-INF/resources/cs.lang.php | 2 +- WEB-INF/resources/da.lang.php | 2 +- WEB-INF/resources/de.lang.php | 2 +- WEB-INF/resources/en.lang.php | 2 +- WEB-INF/resources/et.lang.php | 2 +- WEB-INF/resources/fa.lang.php | 2 +- WEB-INF/resources/fi.lang.php | 2 +- WEB-INF/resources/fr.lang.php | 2 +- WEB-INF/resources/he.lang.php | 2 +- WEB-INF/resources/ja.lang.php | 2 +- WEB-INF/resources/ko.lang.php | 2 +- WEB-INF/resources/nl.lang.php | 2 +- WEB-INF/resources/no.lang.php | 2 +- WEB-INF/resources/pl.lang.php | 2 +- WEB-INF/resources/pt-br.lang.php | 2 +- WEB-INF/resources/pt.lang.php | 2 +- WEB-INF/resources/ro.lang.php | 2 +- WEB-INF/resources/ru.lang.php | 2 +- WEB-INF/resources/sk.lang.php | 2 +- WEB-INF/resources/sl.lang.php | 2 +- WEB-INF/resources/sr.lang.php | 2 +- WEB-INF/resources/sv.lang.php | 2 +- WEB-INF/resources/tr.lang.php | 2 +- WEB-INF/resources/zh-cn.lang.php | 2 +- WEB-INF/resources/zh-tw.lang.php | 2 +- WEB-INF/templates/footer.tpl | 2 +- invoice_view.php | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/WEB-INF/resources/cs.lang.php b/WEB-INF/resources/cs.lang.php index 1267f464..d907c6e9 100644 --- a/WEB-INF/resources/cs.lang.php +++ b/WEB-INF/resources/cs.lang.php @@ -496,7 +496,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Importovat týmová data z xml souboru.', +'form.import.hint' => 'Importovat týmová data z xml souboru.', // TODO: replace "team" with "group". 'form.import.file' => 'Výběr souboru', 'form.import.success' => 'Import byl úspěšně dokončen.', diff --git a/WEB-INF/resources/da.lang.php b/WEB-INF/resources/da.lang.php index 809532b4..4d94cccf 100644 --- a/WEB-INF/resources/da.lang.php +++ b/WEB-INF/resources/da.lang.php @@ -442,7 +442,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Importer teamdata fra en xml-fil.', +'form.import.hint' => 'Importer teamdata fra en xml-fil.', // TODO: replace "team" with "group". 'form.import.file' => 'Vælg fil', 'form.import.success' => 'Import sluttede med succes.', diff --git a/WEB-INF/resources/de.lang.php b/WEB-INF/resources/de.lang.php index 8dd92ef9..eb5a6483 100644 --- a/WEB-INF/resources/de.lang.php +++ b/WEB-INF/resources/de.lang.php @@ -440,7 +440,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Teamdaten von einer XML-Datei importieren.', +'form.import.hint' => 'Teamdaten von einer XML-Datei importieren.', // TODO: replace "team" with "group". 'form.import.file' => 'Datei auswählen', 'form.import.success' => 'Import erfolgreich abgeschlossen.', diff --git a/WEB-INF/resources/en.lang.php b/WEB-INF/resources/en.lang.php index 68133c8f..298a575f 100644 --- a/WEB-INF/resources/en.lang.php +++ b/WEB-INF/resources/en.lang.php @@ -422,7 +422,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Import team data from an xml file.', +'form.import.hint' => 'Import group data from an xml file.', 'form.import.file' => 'Select file', 'form.import.success' => 'Import completed successfully.', diff --git a/WEB-INF/resources/et.lang.php b/WEB-INF/resources/et.lang.php index a8c0a10c..1187ed72 100644 --- a/WEB-INF/resources/et.lang.php +++ b/WEB-INF/resources/et.lang.php @@ -494,7 +494,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Impordi meeskonna andmed xml-failist.', +'form.import.hint' => 'Impordi meeskonna andmed xml-failist.', // TODO: replace "team" with "group". 'form.import.file' => 'Vali fail', 'form.import.success' => 'Andmed imporditud.', diff --git a/WEB-INF/resources/fa.lang.php b/WEB-INF/resources/fa.lang.php index 1b744c6a..3539f357 100644 --- a/WEB-INF/resources/fa.lang.php +++ b/WEB-INF/resources/fa.lang.php @@ -469,7 +469,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'وارد کردن اطلاعات تیم از یک فایل xml', +'form.import.hint' => 'وارد کردن اطلاعات تیم از یک فایل xml', // TODO: replace "team" with "group". 'form.import.file' => 'انتخاب فایل', 'form.import.success' => 'وارد کردن اطلاعات با موفقیت انجام شد', diff --git a/WEB-INF/resources/fi.lang.php b/WEB-INF/resources/fi.lang.php index d861b32b..7ff1bc1e 100644 --- a/WEB-INF/resources/fi.lang.php +++ b/WEB-INF/resources/fi.lang.php @@ -450,7 +450,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Tuo tiimitiedot xml-tiedostosta.', +'form.import.hint' => 'Tuo tiimitiedot xml-tiedostosta.', // TODO: replace "team" with "group". 'form.import.file' => 'Valitse tiedosto', 'form.import.success' => 'Tietojen tuonti onnistui.', diff --git a/WEB-INF/resources/fr.lang.php b/WEB-INF/resources/fr.lang.php index b499eea8..1456edc6 100644 --- a/WEB-INF/resources/fr.lang.php +++ b/WEB-INF/resources/fr.lang.php @@ -439,7 +439,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Importer les donnés des équipes depuis un fichier xml.', +'form.import.hint' => 'Importer les donnés des équipes depuis un fichier xml.', // TODO: replace "team" with "group". Also, it's about 1 group, not many. 'form.import.file' => 'Sélectionner le fichier', 'form.import.success' => 'Importation réussie.', diff --git a/WEB-INF/resources/he.lang.php b/WEB-INF/resources/he.lang.php index ef466880..6cfccd8e 100644 --- a/WEB-INF/resources/he.lang.php +++ b/WEB-INF/resources/he.lang.php @@ -476,7 +476,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'ייבא נתוני צוות מתוך קובץ XML.', +'form.import.hint' => 'ייבא נתוני צוות מתוך קובץ XML.', // TODO: replace "team" with "group". 'form.import.file' => 'בחר קובץ', 'form.import.success' => 'הייבוא הושלם בהצלחה.', diff --git a/WEB-INF/resources/ja.lang.php b/WEB-INF/resources/ja.lang.php index 7f63a9cd..aad7afe6 100644 --- a/WEB-INF/resources/ja.lang.php +++ b/WEB-INF/resources/ja.lang.php @@ -490,7 +490,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'xmlファイルからチームのデータをインポート。', +'form.import.hint' => 'xmlファイルからチームのデータをインポート。', // TODO: replace "team" with "group". 'form.import.file' => 'ファイルの選択', 'form.import.success' => 'インポートが成功的に完了されました。', diff --git a/WEB-INF/resources/ko.lang.php b/WEB-INF/resources/ko.lang.php index 8cafcde5..ca50b7e1 100644 --- a/WEB-INF/resources/ko.lang.php +++ b/WEB-INF/resources/ko.lang.php @@ -488,7 +488,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'xml 파일로부터 팀 데이터를 임포트.', +'form.import.hint' => 'xml 파일로부터 팀 데이터를 임포트.', // TODO: replace "team" with "group". 'form.import.file' => '파일 선택', 'form.import.success' => '성과적으로 완료된 임포트.', diff --git a/WEB-INF/resources/nl.lang.php b/WEB-INF/resources/nl.lang.php index f6496d25..9841116f 100644 --- a/WEB-INF/resources/nl.lang.php +++ b/WEB-INF/resources/nl.lang.php @@ -420,7 +420,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Importeer teamgegevens uit een xml bestand.', +'form.import.hint' => 'Importeer teamgegevens uit een xml bestand.', // TODO: replace "team" with "group". 'form.import.file' => 'Kies bestand', 'form.import.success' => 'Importeren gelukt.', diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php index 6c0e0bff..d6c6fbb1 100644 --- a/WEB-INF/resources/no.lang.php +++ b/WEB-INF/resources/no.lang.php @@ -487,7 +487,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Import team data fra en xml fil.', +'form.import.hint' => 'Import team data fra en xml fil.', // TODO: replace "team" with "group". 'form.import.file' => 'Velg fil', 'form.import.success' => 'Import gjennomført vellykket.', diff --git a/WEB-INF/resources/pl.lang.php b/WEB-INF/resources/pl.lang.php index e59d5809..2c1210ea 100644 --- a/WEB-INF/resources/pl.lang.php +++ b/WEB-INF/resources/pl.lang.php @@ -452,7 +452,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Import danych zespołu z pliku xml.', +'form.import.hint' => 'Import danych zespołu z pliku xml.', // TODO: replace "team" with "group". 'form.import.file' => 'Wybierz plik', 'form.import.success' => 'Import zakończony powodzeniem.', diff --git a/WEB-INF/resources/pt-br.lang.php b/WEB-INF/resources/pt-br.lang.php index 944870f3..ad7d5d13 100644 --- a/WEB-INF/resources/pt-br.lang.php +++ b/WEB-INF/resources/pt-br.lang.php @@ -447,7 +447,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Importar dados de equipe de um arquivo xml.', +'form.import.hint' => 'Importar dados de equipe de um arquivo xml.', // TODO: replace "team" with "group". 'form.import.file' => 'Selecionar arquivo', 'form.import.success' => 'Importação realizada com sucesso.', diff --git a/WEB-INF/resources/pt.lang.php b/WEB-INF/resources/pt.lang.php index 8514a368..a5139b78 100644 --- a/WEB-INF/resources/pt.lang.php +++ b/WEB-INF/resources/pt.lang.php @@ -471,7 +471,7 @@ $i18n_key_words = array( // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). // TODO: translate the following. -// 'form.import.hint' => 'Import team data from an xml file.', +// 'form.import.hint' => 'Import group data from an xml file.', // 'form.import.file' => 'Select file', // 'form.import.success' => 'Import completed successfully.', diff --git a/WEB-INF/resources/ro.lang.php b/WEB-INF/resources/ro.lang.php index baf430bb..9b068a7e 100644 --- a/WEB-INF/resources/ro.lang.php +++ b/WEB-INF/resources/ro.lang.php @@ -492,7 +492,7 @@ $i18n_key_words = array( // 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Importa date echipa dintr-un fisier xml.', +'form.import.hint' => 'Importa date echipa dintr-un fisier xml.', // TODO: replace "team" with "group". 'form.import.file' => 'Alege fisier', 'form.import.success' => 'Importul s-a incheiat cu succes.', diff --git a/WEB-INF/resources/ru.lang.php b/WEB-INF/resources/ru.lang.php index e6d639d1..1399049a 100644 --- a/WEB-INF/resources/ru.lang.php +++ b/WEB-INF/resources/ru.lang.php @@ -419,7 +419,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'в формате bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Импортируйте данные команды из xml файла.', +'form.import.hint' => 'Импортируйте данные группы из xml файла.', 'form.import.file' => 'Укажите файл', 'form.import.success' => 'Импорт успешно выполнен.', diff --git a/WEB-INF/resources/sk.lang.php b/WEB-INF/resources/sk.lang.php index 4d8cd9da..8fed200f 100644 --- a/WEB-INF/resources/sk.lang.php +++ b/WEB-INF/resources/sk.lang.php @@ -467,7 +467,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Importovať dáta o tíme z xml súboru.', +'form.import.hint' => 'Importovať dáta o tíme z xml súboru.', // TODO: replace "team" with "group". 'form.import.file' => 'Vyberte súbor', 'form.import.success' => 'Import úspešne dokončený.', diff --git a/WEB-INF/resources/sl.lang.php b/WEB-INF/resources/sl.lang.php index 3609b46f..8c006293 100644 --- a/WEB-INF/resources/sl.lang.php +++ b/WEB-INF/resources/sl.lang.php @@ -467,7 +467,7 @@ $i18n_key_words = array( // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). // TODO: translate the following. -// 'form.import.hint' => 'Import team data from an xml file.', +// 'form.import.hint' => 'Import group data from an xml file.', // 'form.import.file' => 'Select file', // 'form.import.success' => 'Import completed successfully.', diff --git a/WEB-INF/resources/sr.lang.php b/WEB-INF/resources/sr.lang.php index f42f339f..6aede0a0 100644 --- a/WEB-INF/resources/sr.lang.php +++ b/WEB-INF/resources/sr.lang.php @@ -451,7 +451,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Uvezi podatke timova iz xml fajla.', +'form.import.hint' => 'Uvezi podatke timova iz xml fajla.', // TODO: replace "team" with "group". 'form.import.file' => 'Odaberi datoteku', 'form.import.success' => 'Uvoz uspešan.', diff --git a/WEB-INF/resources/sv.lang.php b/WEB-INF/resources/sv.lang.php index 4774453b..ad943a30 100644 --- a/WEB-INF/resources/sv.lang.php +++ b/WEB-INF/resources/sv.lang.php @@ -445,7 +445,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'B-zip', // Importing Group Data form. See example at https://timetracker.anuko.com/import.php (login as admin first). -'form.import.hint' => 'Importera arbetsgrupp från en XML-fil.', +'form.import.hint' => 'Importera grupp från en XML-fil.', 'form.import.file' => 'Välj fil', 'form.import.success' => 'Importeringen lyckades utan problem.', diff --git a/WEB-INF/resources/tr.lang.php b/WEB-INF/resources/tr.lang.php index 9359107c..fcbd981a 100644 --- a/WEB-INF/resources/tr.lang.php +++ b/WEB-INF/resources/tr.lang.php @@ -505,7 +505,7 @@ $i18n_key_words = array( // 'form.export.compression_bzip' => 'bzip', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => 'Ekip bilgileri bir xml dosyasından içe aktar.', +'form.import.hint' => 'Ekip bilgileri bir xml dosyasından içe aktar.', // TODO: replace "team" with "group". 'form.import.file' => 'Dosya seç', 'form.import.success' => 'Içe aktarma başarıyla tamamlandı.', diff --git a/WEB-INF/resources/zh-cn.lang.php b/WEB-INF/resources/zh-cn.lang.php index b0d15aaa..b1a1bdaa 100644 --- a/WEB-INF/resources/zh-cn.lang.php +++ b/WEB-INF/resources/zh-cn.lang.php @@ -474,7 +474,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip格式', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => '从xml文件导入团队数据。', +'form.import.hint' => '从xml文件导入团队数据。', // TODO: replace "team" with "group". 'form.import.file' => '选择档', 'form.import.success' => '成功完成导入。', diff --git a/WEB-INF/resources/zh-tw.lang.php b/WEB-INF/resources/zh-tw.lang.php index ae6a09e6..a070b1a2 100644 --- a/WEB-INF/resources/zh-tw.lang.php +++ b/WEB-INF/resources/zh-tw.lang.php @@ -482,7 +482,7 @@ $i18n_key_words = array( 'form.export.compression_bzip' => 'bzip格式', // Importing Group Data form. See example at https://timetracker.anuko.com/imort.php (login as admin first). -'form.import.hint' => '從xml檔導入團隊資料。', +'form.import.hint' => '從xml檔導入團隊資料。', // TODO: replace "team" with "group". 'form.import.file' => '選擇檔', 'form.import.success' => '成功完成導入。', diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index ce8281a6..a4b7a7d0 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.17.87.4233 | Copyright © Anuko | +  Anuko Time Tracker 1.17.87.4234 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/invoice_view.php b/invoice_view.php index 22383c02..8168c3ad 100644 --- a/invoice_view.php +++ b/invoice_view.php @@ -61,7 +61,7 @@ $subtotal = 0; $tax = 0; foreach($invoice_items as $item) $subtotal += $item['cost']; -if ($tax_percent) { +if ($tax_percent > 0) { $tax_expenses = $user->isPluginEnabled('et'); foreach($invoice_items as $item) { if ($item['type'] == 2 && !$tax_expenses) -- 2.20.1