lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: If language code is none_NONE, trnalsation keys are kept not

Browse Source 
translated.
This commit is contained in:
Laurent Destailleur 2012-02-01 13:28:19 +01:00
parent 267389de0a
commit 95efe50dba
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/translate.class.php
View File

@ -21,8 +21,6 @@
* \file htdocs/core/class/translate.class.php * \file htdocs/core/class/translate.class.php
* \ingroup core * \ingroup core
* \brief File for Tanslate class * \brief File for Tanslate class
* \author Eric Seigne
* \author Laurent Destailleur
*/ */
@ -165,6 +163,7 @@ class Translate
dol_print_error('',get_class($this)."::Load ErrorWrongParameters"); dol_print_error('',get_class($this)."::Load ErrorWrongParameters");
exit; exit;
} }
if ($this->defaultlang == 'none_NONE') return; // Special language code to not translate keys
//dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang); //dol_syslog("Translate::Load Start domain=".$domain." alt=".$alt." forcelangdir=".$forcelangdir." this->defaultlang=".$this->defaultlang);
@ -192,7 +191,7 @@ class Translate
$langarray=explode('_',$langofdir); $langarray=explode('_',$langofdir);
if ($alt < 1 && strtolower($langarray[0]) == strtolower($langarray[1])) $alt=1; if ($alt < 1 && strtolower($langarray[0]) == strtolower($langarray[1])) $alt=1;
if ($alt < 2 && (strtolower($langofdir) == 'en_us' || strtolower($langofdir) == 'fr_fr' || strtolower($langofdir) == 'es_es')) $alt=2; if ($alt < 2 && (strtolower($langofdir) == 'en_us' || strtolower($langofdir) == 'fr_fr' || strtolower($langofdir) == 'es_es')) $alt=2;
foreach($this->dir as $keydir => $searchdir) foreach($this->dir as $keydir => $searchdir)
{ {
// Directory of translation files // Directory of translation files