diff --git a/public_html/deployment/classes/rollout_base.class.php b/public_html/deployment/classes/rollout_base.class.php index d858987482ad9e96e73314c95bd33870e43a8673..2f022d1683aec7ed5348eed311ed07c45dcde77e 100644 --- a/public_html/deployment/classes/rollout_base.class.php +++ b/public_html/deployment/classes/rollout_base.class.php @@ -30,13 +30,20 @@ class rollout_base implements iRolloutplugin{ * @var type */ protected $_aLang=false; - + /** * set language; 2 letter code, i.e. "de"; default language is "en" ; a * file "lang_en.json" is required in the plugin dir * @var string */ - protected $_sLang = 'en'; + protected $_sFallbackLang = 'en-en'; + + /** + * set language; 2 letter code, i.e. "de"; default language is "en" ; a + * file "lang_en.json" is required in the plugin dir + * @var string + */ + protected $_sLang = 'en-en'; /** * string with phase of project; one of preview|stage|live @@ -336,7 +343,7 @@ class rollout_base implements iRolloutplugin{ * translated texts can be done with $this->_t("your_key") * * @see _t() - * @param string $sLang language code, i.e. "de" + * @param string $sLang language code, i.e. "de-de" * @return boolean */ public function setLang($sLang=false){ @@ -344,6 +351,10 @@ class rollout_base implements iRolloutplugin{ $oReflection=new ReflectionClass($this); $sFile=dirname($oReflection->getFileName()) . '/lang_'.$this->_sLang.'.json'; + if (!file_exists($sFile)){ + $sFile=dirname($oReflection->getFileName()) . '/lang_'.$this->_sFallbackLang.'.json'; + $this->_sLang=$this->_sFallbackLang; + } $this->_aLang=(file_exists($sFile)) ? json_decode(file_get_contents($sFile), 1) : $this->_aLang; return true; } diff --git a/public_html/deployment/plugins/build/tgz/lang_de.json b/public_html/deployment/plugins/build/tgz/lang_de-de.json similarity index 100% rename from public_html/deployment/plugins/build/tgz/lang_de.json rename to public_html/deployment/plugins/build/tgz/lang_de-de.json diff --git a/public_html/deployment/plugins/build/tgz/lang_en.json b/public_html/deployment/plugins/build/tgz/lang_en-en.json similarity index 100% rename from public_html/deployment/plugins/build/tgz/lang_en.json rename to public_html/deployment/plugins/build/tgz/lang_en-en.json diff --git a/public_html/deployment/plugins/rollout/awx/lang_de.json b/public_html/deployment/plugins/rollout/awx/lang_de-de.json similarity index 100% rename from public_html/deployment/plugins/rollout/awx/lang_de.json rename to public_html/deployment/plugins/rollout/awx/lang_de-de.json diff --git a/public_html/deployment/plugins/rollout/awx/lang_en.json b/public_html/deployment/plugins/rollout/awx/lang_en-en.json similarity index 100% rename from public_html/deployment/plugins/rollout/awx/lang_en.json rename to public_html/deployment/plugins/rollout/awx/lang_en-en.json diff --git a/public_html/deployment/plugins/rollout/default/lang_de.json b/public_html/deployment/plugins/rollout/default/lang_de-de.json similarity index 100% rename from public_html/deployment/plugins/rollout/default/lang_de.json rename to public_html/deployment/plugins/rollout/default/lang_de-de.json diff --git a/public_html/deployment/plugins/rollout/default/lang_en.json b/public_html/deployment/plugins/rollout/default/lang_en-en.json similarity index 100% rename from public_html/deployment/plugins/rollout/default/lang_en.json rename to public_html/deployment/plugins/rollout/default/lang_en-en.json diff --git a/public_html/deployment/plugins/rollout/ssh/lang_de.json b/public_html/deployment/plugins/rollout/ssh/lang_de-de.json similarity index 100% rename from public_html/deployment/plugins/rollout/ssh/lang_de.json rename to public_html/deployment/plugins/rollout/ssh/lang_de-de.json diff --git a/public_html/deployment/plugins/rollout/ssh/lang_en.json b/public_html/deployment/plugins/rollout/ssh/lang_en-en.json similarity index 100% rename from public_html/deployment/plugins/rollout/ssh/lang_en.json rename to public_html/deployment/plugins/rollout/ssh/lang_en-en.json