diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index ecc25c58509..8f764a93b98 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -40,7 +40,7 @@ $transkey = GETPOST('transkey', 'alphanohtml');
$transvalue = GETPOST('transvalue', 'none');
-$mode = GETPOST('mode', 'aZ09') ?GETPOST('mode', 'aZ09') : 'overwrite';
+$mode = GETPOST('mode', 'aZ09') ?GETPOST('mode', 'aZ09') : 'searchkey';
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
@@ -514,7 +514,7 @@ if ($mode == 'searchkey')
if ($i > ($offset + $limit)) break;
print '
| '.$langcode.' | '.$key.' | ';
print dol_escape_htmltag($val);
- print ' | ';
+ print ' | ';
if (!empty($newlangfileonly->tab_translate[$key]))
{
if ($val != $newlangfileonly->tab_translate[$key])
@@ -534,7 +534,7 @@ if ($mode == 'searchkey')
print ' ';
print ''.img_delete().'';
print ' ';
- $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
+ $htmltext = $langs->trans("OriginalValueWas", ''.$newlangfileonly->tab_translate[$key].'');
print $form->textwithpicto('', $htmltext, 1, 'info');
}
elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
@@ -549,7 +549,7 @@ if ($mode == 'searchkey')
//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
- print ' '.img_picto('FixOnTransifex', 'globe').'';
+ print ' '.img_picto($langs->trans('FixOnTransifex'), 'globe').'';
}
}
else
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 12fb15d3b2a..7b3d66f9003 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -721,16 +721,16 @@ function translation_prepare_head()
$h = 0;
$head = array();
- $head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";
- $head[$h][1] = $langs->trans("TranslationOverwriteKey").'';
- $head[$h][2] = 'overwrite';
- $h++;
-
$head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=searchkey";
$head[$h][1] = $langs->trans("TranslationKeySearch");
$head[$h][2] = 'searchkey';
$h++;
+ $head[$h][0] = DOL_URL_ROOT."/admin/translation.php?mode=overwrite";
+ $head[$h][1] = $langs->trans("TranslationOverwriteKey").'';
+ $head[$h][2] = 'overwrite';
+ $h++;
+
complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin');
complete_head_from_modules($conf, $langs, null, $head, $h, 'translation_admin', 'remove');
|