From 5827bde6b01b0632f6ed425ee48bf4a7e4a7c2e0 Mon Sep 17 00:00:00 2001 From: Werner Masik Date: Tue, 26 Sep 2023 15:25:43 +0200 Subject: [PATCH] update phrasen --- public/js/mixins/Phrasen.js | 35 +++++++--------- system/phrasesupdate.php | 84 ++++++++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 21 deletions(-) diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js index b93cfac97..edaf4d101 100644 --- a/public/js/mixins/Phrasen.js +++ b/public/js/mixins/Phrasen.js @@ -44,23 +44,6 @@ function getValueForLoadedPhrase(category, phrase, params) { return result; } -// Composable (wrapper for mixin) -export function usePhrasen() { - - function t_ref(category, phrase, params) { - return phrasen.t_ref(category, phrase, params); - } - - function t(category, phrase, params) { - return phrasen.t(category, phrase, params); - } - - return { - t_ref, - t, - } - -} const phrasen = { t_ref(category, phrase, params) { @@ -76,8 +59,9 @@ const phrasen = { return ''; } if (!categories[category]) { -// if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) -// categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category); + + //if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) + // categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category); if (!categories[category] || Object.keys(categories[category]).length === 0) { categories[category] = undefined; @@ -101,3 +85,16 @@ export default { } } } + +// Composable (wrapper for mixin) +export function usePhrasen() { + + function t(category, phrase, params) { + return phrasen.t(category, phrase, params); + } + + return { + t, + } + +} diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 0a64b38d7..d12fbf300 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -1740,7 +1740,7 @@ $phrases = array( 'insertvon' => 'system' ) ) - ), + ), array( 'app' => 'core', 'category' => 'person', @@ -1795,7 +1795,7 @@ $phrases = array( ), array( 'sprache' => 'English', - 'text' => 'Address', + 'text' => 'Salutation', 'description' => '', 'insertvon' => 'system' ) @@ -18797,6 +18797,86 @@ array( ) ), // Personalverwaltung begin + array( + 'app' => 'core', + 'category' => 'global', + 'phrase' => 'warnung', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Warnung', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Warning', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'vornamen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Vornamen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'middle names', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'person', + 'phrase' => 'sprache', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Sprache', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'language', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'personalverwaltung', + 'category' => 'person', + 'phrase' => 'stammdatenGespeichert', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Stammdaten gespeichert', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Master data saved', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'personalverwaltung', 'category' => 'vbform',