diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php index 5e6d242dffc..86a605afa53 100644 --- a/htdocs/admin/translation.php +++ b/htdocs/admin/translation.php @@ -279,6 +279,14 @@ if ($mode == 'overwrite') if ($mode == 'searchkey') { + $langcode=GETPOST('langcode')?GETPOST('langcode'):$langs->defaultlang; + + $newlang=new Translate('',$conf); + $newlang->setDefaultLang($langcode); + + $newlangfileonly=new Translate('',$conf); + $newlangfileonly->setDefaultLang($langcode); + $recordtoshow=array(); $nbempty=0; @@ -294,9 +302,6 @@ if ($mode == 'searchkey') } else { - $newlang=new Translate('',$conf); - $newlang->setDefaultLang($langcode); - // Load all translations keys foreach($conf->file->dol_document_root as $keydir => $searchdir) { @@ -310,6 +315,7 @@ if ($mode == 'searchkey') { $tmpfile=preg_replace('/.lang/i', '', basename($file['name'])); $newlang->load($tmpfile, 0, 0, '', 0); + $newlangfileonly->load($tmpfile, 0, 0, '', 1); //print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records
'."\n"; } } @@ -352,7 +358,6 @@ if ($mode == 'searchkey') print "\n"; print ''; - $langcode=GETPOST('langcode')?GETPOST('langcode'):$langs->defaultlang; //print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1); print $formadmin->select_language($langcode,'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1); print ''."\n"; @@ -367,11 +372,11 @@ if ($mode == 'searchkey') print ''; print ''; print ''; - print ''; + print ''; } else { - print ''; + print ''; print ''; } print ''; @@ -385,13 +390,21 @@ if ($mode == 'searchkey') // Show result $i=0; + $var=false; foreach($recordtoshow as $key => $val) { $i++; if ($i <= $offset) continue; if ($i > ($offset + $limit)) break; - print ''.$langcode.''.$key.''; + $var=!$var; + print ''.$langcode.''.$key.''; print dol_escape_htmltag($val); + print ''; + if ($val != $newlangfileonly->tab_translate[$key]) + { + $htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]); + print $form->textwithpicto('', $htmltext, 1, 'warning'); + } print ''."\n"; } diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 4549aa74181..ebac37ce6d8 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -1047,6 +1047,7 @@ TranslationString=Translation string CurrentTranslationString=Current translation string WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string NewTranslationStringToShow=New translation string to show +OriginalValueWas=The original translation is overwritten. Original value was:

%s TotalNumberOfActivatedModules=Total number of activated feature modules: %s / %s YouMustEnableOneModule=You must at least enable 1 module ClassNotFoundIntoPathWarning=Class %s not found into PHP path