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

Merge pull request #13453 from ptibogxiv/patch-317

Browse Source 
NEW compatibility of translatebel with more dict
This commit is contained in:
Laurent Destailleur 2020-04-02 12:53:59 +02:00 committed by GitHub
commit 276c860910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
htdocs/api/class/api_setup.class.php
View File

@ -230,7 +230,7 @@ class Setup extends DolibarrApi
if ($country->fetch($obj->rowid) > 0) { if ($country->fetch($obj->rowid) > 0) {
// Translate the name of the country if needed // Translate the name of the country if needed
// and then apply the filter if there is one. // and then apply the filter if there is one.
$this->translateLabel($country, $lang); $this->translateLabel($country, $lang, 'Country');
if (empty($filter) || stripos($country->label, $filter) !== false) { if (empty($filter) || stripos($country->label, $filter) !== false) {
$list[] = $this->_cleanObjectDatas($country); $list[] = $this->_cleanObjectDatas($country);
@ -318,7 +318,7 @@ class Setup extends DolibarrApi
throw new RestException(404, 'country not found'); throw new RestException(404, 'country not found');
} }
$this->translateLabel($country, $lang); $this->translateLabel($country, $lang, 'Country');
return $this->_cleanObjectDatas($country); return $this->_cleanObjectDatas($country);
} }
@ -403,14 +403,15 @@ class Setup extends DolibarrApi
} }
/** /**
* Translate the name of the country to the given language. * Translate the name of the object to the given language.
*
* @param object $object Object with label to translate
* @param string $lang Code of the language the name of the object must be translated to
* @param string $prefix Prefix for translation key
* *
* @param Ccountry $country Country
* @param string $lang Code of the language the name of the
* country must be translated to
* @return void * @return void
*/ */
private function translateLabel($country, $lang) private function translateLabel($object, $lang, $prefix = 'Country')
{ {
if (!empty($lang)) { if (!empty($lang)) {
// Load the translations if this is a new language. // Load the translations if this is a new language.
@ -420,11 +421,12 @@ class Setup extends DolibarrApi
$this->translations->setDefaultLang($lang); $this->translations->setDefaultLang($lang);
$this->translations->load('dict'); $this->translations->load('dict');
} }
if ($country->code) { if ($object->code) {
$key = 'Country'.$country->code; $key = $prefix.$object->code;
$translation = $this->translations->trans($key); $translation = $this->translations->trans($key);
if ($translation != $key) { if ($translation != $key) {
$country->label = html_entity_decode($translation); $object->label = html_entity_decode($translation);
} }
} }
} }