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

Show warning for overwritten translation

Browse Source
This commit is contained in:
Laurent Destailleur 2016-09-04 14:58:58 +02:00
parent d24045d831
commit 6da7410c18
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/admin/translation.php
View File

@ -279,6 +279,14 @@ if ($mode == 'overwrite')
if ($mode == 'searchkey') 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(); $recordtoshow=array();
$nbempty=0; $nbempty=0;
@ -294,9 +302,6 @@ if ($mode == 'searchkey')
} }
else else
{ {
$newlang=new Translate('',$conf);
$newlang->setDefaultLang($langcode);
// Load all translations keys // Load all translations keys
foreach($conf->file->dol_document_root as $keydir => $searchdir) foreach($conf->file->dol_document_root as $keydir => $searchdir)
{ {
@ -310,6 +315,7 @@ if ($mode == 'searchkey')
{ {
$tmpfile=preg_replace('/.lang/i', '', basename($file['name'])); $tmpfile=preg_replace('/.lang/i', '', basename($file['name']));
$newlang->load($tmpfile, 0, 0, '', 0); $newlang->load($tmpfile, 0, 0, '', 0);
$newlangfileonly->load($tmpfile, 0, 0, '', 1);
//print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n"; //print 'After loading lang '.$tmpfile.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
} }
} }
@ -352,7 +358,6 @@ if ($mode == 'searchkey')
print "\n"; print "\n";
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
$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,$langs->trans("All"),0,0,'',1);
print $formadmin->select_language($langcode,'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1); print $formadmin->select_language($langcode,'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
print '</td>'."\n"; print '</td>'."\n";
@ -367,11 +372,11 @@ if ($mode == 'searchkey')
print '<td>'; print '<td>';
print '<input type="text" class="flat" size="1" name="entitysearch" value="'.$conf->entity.'">'; print '<input type="text" class="flat" size="1" name="entitysearch" value="'.$conf->entity.'">';
print '</td>'; print '</td>';
print '<td align="center">'; print '<td align="right">';
} }
else else
{ {
print '<td align="center">'; print '<td align="right">';
print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">'; print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
} }
print '<input type="submit" class="button" value="'.$langs->trans("Search").'" name="search">'; print '<input type="submit" class="button" value="'.$langs->trans("Search").'" name="search">';
@ -385,13 +390,21 @@ if ($mode == 'searchkey')
// Show result // Show result
$i=0; $i=0;
$var=false;
foreach($recordtoshow as $key => $val) foreach($recordtoshow as $key => $val)
{ {
$i++; $i++;
if ($i <= $offset) continue; if ($i <= $offset) continue;
if ($i > ($offset + $limit)) break; if ($i > ($offset + $limit)) break;
print '<tr><td>'.$langcode.'</td><td>'.$key.'</td><td colspan="2">'; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langcode.'</td><td>'.$key.'</td><td>';
print dol_escape_htmltag($val); print dol_escape_htmltag($val);
print '</td><td align="right">';
if ($val != $newlangfileonly->tab_translate[$key])
{
$htmltext = $langs->trans("OriginalValueWas", $newlangfileonly->tab_translate[$key]);
print $form->textwithpicto('', $htmltext, 1, 'warning');
}
print '</td></tr>'."\n"; print '</td></tr>'."\n";
} }

1
htdocs/langs/en_US/admin.lang
View File

@ -1047,6 +1047,7 @@ TranslationString=Translation string
CurrentTranslationString=Current translation string CurrentTranslationString=Current translation string
WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
NewTranslationStringToShow=New translation string to show NewTranslationStringToShow=New translation string to show
OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b> TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
YouMustEnableOneModule=You must at least enable 1 module YouMustEnableOneModule=You must at least enable 1 module
ClassNotFoundIntoPathWarning=Class %s not found into PHP path ClassNotFoundIntoPathWarning=Class %s not found into PHP path