Skip to content

Commit 40dd9fb

Browse files
tbrehmtbrehm
committed
Fixed: FS#1014 - Some strings can not be translated (missing in en.lng?)
Merged all language files.
1 parent 2da616a commit 40dd9fb

File tree

361 files changed

+3399
-2590
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+3399
-2590
lines changed

‎interface/lib/app.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public function load_language_file($filename) {
175175
@include_once($filename);
176176
if(is_array($wb)) {
177177
if(is_array($this->_wb)) {
178-
$this->_wb = array_merge($wb,$this->_wb);
178+
$this->_wb = array_merge($this->_wb,$wb);
179179
} else {
180180
$this->_wb = $wb;
181181
}

‎interface/lib/classes/tform.inc.php‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ function loadFormDef($file,$module = '') {
131131
$wb = array();
132132

133133
include_once(ISPC_ROOT_PATH.'/lib/lang/'.$_SESSION['s']['language'].'.lng');
134+
135+
if(is_array($wb)) $wb_global = $wb;
136+
134137
if($module == '') {
135138
$lng_file = "lib/lang/".$_SESSION["s"]["language"]."_".$this->formDef["name"].".lng";
136139
if(!file_exists($lng_file)) $lng_file = "lib/lang/en_".$this->formDef["name"].".lng";
@@ -140,6 +143,12 @@ function loadFormDef($file,$module = '') {
140143
if(!file_exists($lng_file)) $lng_file = "../$module/lib/lang/en_".$this->formDef["name"].".lng";
141144
include($lng_file);
142145
}
146+
147+
if(is_array($wb_global)) {
148+
$wb = array_merge($wb_global,$wb);
149+
}
150+
if(isset($wb_global)) unset($wb_global);
151+
143152
$this->wordbook = $wb;
144153

145154
return true;
@@ -965,15 +974,17 @@ function showForm() {
965974
foreach( $this->formDef["tabs"] as $key => $tab) {
966975

967976
$tab['name'] = $key;
977+
// Translate the title of the tab
978+
$tab['title'] = $this->lng($tab['title']);
979+
968980
if($tab['name'] == $active_tab) {
969981

970982
// If module is set, then set the template path relative to the module..
971983
if($this->module != '') $tab["template"] = "../".$this->module."/".$tab["template"];
972984

973985
// Generate the template if it does not exist yet.
974986

975-
// Translate the title of the tab
976-
$tab['title'] = $this->lng($tab['title']);
987+
977988

978989
if(!is_file($tab["template"])) {
979990
$app->uses('tform_tpl_generator');

‎interface/lib/lang/bg.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ $wb['filter_txt'] = 'Filter';
2121
$wb['add_new_record_txt'] = 'Add new record';
2222
$wb['btn_save_txt'] = 'Save';
2323
$wb['btn_cancel_txt'] = 'Cancel';
24-
$wb['System'] = 'System';
25-
$wb['Client'] = 'Client';
26-
$wb['Email'] = 'Email';
27-
$wb['Monitor'] = 'Monitor';
28-
$wb['Sites'] = 'Sites';
29-
$wb['DNS'] = 'DNS';
30-
$wb['Tools'] = 'Tools';
31-
$wb['Help'] = 'Help';
3224
$wb['toolsarea_head_txt'] = 'Tools';
3325
$wb['page_and_txt'] = 'and';
26+
$wb['top_menu_system'] = 'System';
27+
$wb['top_menu_client'] = 'Client';
28+
$wb['top_menu_email'] = 'Email';
29+
$wb['top_menu_monitor'] = 'Monitor';
30+
$wb['top_menu_sites'] = 'Sites';
31+
$wb['top_menu_dns'] = 'DNS';
32+
$wb['top_menu_tools'] = 'Tools';
33+
$wb['top_menu_help'] = 'Help';
3434
?>

‎interface/lib/lang/br.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ $wb['filter_txt'] = 'Filtrar';
2121
$wb['add_new_record_txt'] = 'Adcionar novo registro';
2222
$wb['btn_save_txt'] = 'Salvar';
2323
$wb['btn_cancel_txt'] = 'Voltar';
24-
$wb['System'] = 'Sistema';
25-
$wb['Client'] = 'Cliente';
26-
$wb['Email'] = 'Correio';
27-
$wb['Monitor'] = 'Monitor';
28-
$wb['Sites'] = 'Sites';
29-
$wb['DNS'] = 'DNS';
30-
$wb['Tools'] = 'Ferramentas';
31-
$wb['Help'] = 'Ajuda';
3224
$wb['toolsarea_head_txt'] = 'Ferramentas';
3325
$wb['page_and_txt'] = 'and';
26+
$wb['top_menu_system'] = 'System';
27+
$wb['top_menu_client'] = 'Client';
28+
$wb['top_menu_email'] = 'Email';
29+
$wb['top_menu_monitor'] = 'Monitor';
30+
$wb['top_menu_sites'] = 'Sites';
31+
$wb['top_menu_dns'] = 'DNS';
32+
$wb['top_menu_tools'] = 'Tools';
33+
$wb['top_menu_help'] = 'Help';
3434
?>

‎interface/lib/lang/de.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ $wb['filter_txt'] = 'Filter';
2121
$wb['add_new_record_txt'] = 'Neuen Datensatz hinzufügen';
2222
$wb['btn_save_txt'] = 'Speichern';
2323
$wb['btn_cancel_txt'] = 'Abbrechen';
24-
$wb['System'] = 'System';
25-
$wb['Client'] = 'Client';
26-
$wb['Email'] = 'Email';
27-
$wb['Monitor'] = 'Monitor';
28-
$wb['Sites'] = 'Sites';
29-
$wb['DNS'] = 'DNS';
30-
$wb['Tools'] = 'Tools';
31-
$wb['Help'] = 'Help';
3224
$wb['toolsarea_head_txt'] = 'Tools';
3325
$wb['page_and_txt'] = 'and';
26+
$wb['top_menu_system'] = 'System';
27+
$wb['top_menu_client'] = 'Client';
28+
$wb['top_menu_email'] = 'Email';
29+
$wb['top_menu_monitor'] = 'Monitor';
30+
$wb['top_menu_sites'] = 'Sites';
31+
$wb['top_menu_dns'] = 'DNS';
32+
$wb['top_menu_tools'] = 'Tools';
33+
$wb['top_menu_help'] = 'Help';
3434
?>

‎interface/lib/lang/en.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ $wb["filter_txt"] = 'Filter';
2323
$wb["add_new_record_txt"] = 'Add new record';
2424
$wb['btn_save_txt'] = "Save";
2525
$wb['btn_cancel_txt'] = "Back";
26-
$wb['System'] = 'System';
27-
$wb['Client'] = 'Client';
28-
$wb['Email'] = 'Email';
29-
$wb['Monitor'] = 'Monitor';
30-
$wb['Sites'] = 'Sites';
31-
$wb['DNS'] = 'DNS';
32-
$wb['Tools'] = 'Tools';
33-
$wb['Help'] = 'Help';
26+
$wb['top_menu_system'] = 'System';
27+
$wb['top_menu_client'] = 'Client';
28+
$wb['top_menu_email'] = 'Email';
29+
$wb['top_menu_monitor'] = 'Monitor';
30+
$wb['top_menu_sites'] = 'Sites';
31+
$wb['top_menu_dns'] = 'DNS';
32+
$wb['top_menu_tools'] = 'Tools';
33+
$wb['top_menu_help'] = 'Help';
3434
$wb['toolsarea_head_txt'] = 'Tools';
3535
?>

‎interface/lib/lang/es.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ $wb['filter_txt'] = 'Filtrar';
2121
$wb['add_new_record_txt'] = 'Añadir un nuevo registro';
2222
$wb['btn_save_txt'] = 'Guardar';
2323
$wb['btn_cancel_txt'] = 'Cancelar';
24-
$wb['System'] = 'Sistema';
25-
$wb['Client'] = 'Cliente';
26-
$wb['Email'] = 'Correo';
27-
$wb['Monitor'] = 'Monitor';
28-
$wb['Sites'] = 'Sitios';
29-
$wb['DNS'] = 'DNS';
30-
$wb['Tools'] = 'Herramientas';
31-
$wb['Help'] = 'Ayuda';
3224
$wb['toolsarea_head_txt'] = 'Herramientas';
3325
$wb['page_and_txt'] = 'and';
26+
$wb['top_menu_system'] = 'System';
27+
$wb['top_menu_client'] = 'Client';
28+
$wb['top_menu_email'] = 'Email';
29+
$wb['top_menu_monitor'] = 'Monitor';
30+
$wb['top_menu_sites'] = 'Sites';
31+
$wb['top_menu_dns'] = 'DNS';
32+
$wb['top_menu_tools'] = 'Tools';
33+
$wb['top_menu_help'] = 'Help';
3434
?>

‎interface/lib/lang/fi.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ $wb['filter_txt'] = 'Suodatin';
2121
$wb['add_new_record_txt'] = 'Lisää uusi tietue';
2222
$wb['btn_save_txt'] = 'Tallenna';
2323
$wb['btn_cancel_txt'] = 'Keskeytä';
24-
$wb['System'] = 'Järjestelmä';
25-
$wb['Client'] = 'Asiakkaat';
26-
$wb['Email'] = 'Sähköposti';
27-
$wb['Monitor'] = 'Valvonta';
28-
$wb['Sites'] = 'Verkkotunnukset';
29-
$wb['DNS'] = 'Nimipalvelut';
30-
$wb['Tools'] = 'Työkalut';
31-
$wb['Help'] = 'Tuki';
3224
$wb['toolsarea_head_txt'] = 'Työkalut';
3325
$wb['page_and_txt'] = 'and';
26+
$wb['top_menu_system'] = 'System';
27+
$wb['top_menu_client'] = 'Client';
28+
$wb['top_menu_email'] = 'Email';
29+
$wb['top_menu_monitor'] = 'Monitor';
30+
$wb['top_menu_sites'] = 'Sites';
31+
$wb['top_menu_dns'] = 'DNS';
32+
$wb['top_menu_tools'] = 'Tools';
33+
$wb['top_menu_help'] = 'Help';
3434
?>

‎interface/lib/lang/fr.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ $wb['filter_txt'] = 'Filtrer';
2121
$wb['add_new_record_txt'] = 'Ajouter une entrée';
2222
$wb['btn_save_txt'] = 'Enregistrer';
2323
$wb['btn_cancel_txt'] = 'Annuler';
24-
$wb['System'] = 'Système';
25-
$wb['Client'] = 'Client';
26-
$wb['Email'] = 'Email';
27-
$wb['Monitor'] = 'Moniteur';
28-
$wb['Sites'] = 'Sites';
29-
$wb['DNS'] = 'DNS';
30-
$wb['Tools'] = 'Outils';
31-
$wb['Help'] = 'Aide';
3224
$wb['toolsarea_head_txt'] = 'Outils';
3325
$wb['page_and_txt'] = 'and';
26+
$wb['top_menu_system'] = 'System';
27+
$wb['top_menu_client'] = 'Client';
28+
$wb['top_menu_email'] = 'Email';
29+
$wb['top_menu_monitor'] = 'Monitor';
30+
$wb['top_menu_sites'] = 'Sites';
31+
$wb['top_menu_dns'] = 'DNS';
32+
$wb['top_menu_tools'] = 'Tools';
33+
$wb['top_menu_help'] = 'Help';
3434
?>

‎interface/lib/lang/hu.lng‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ $wb['filter_txt'] = 'Szűrés';
2121
$wb['add_new_record_txt'] = 'Új bejegyzés';
2222
$wb['btn_save_txt'] = 'Mentés';
2323
$wb['btn_cancel_txt'] = 'Mégse';
24-
$wb['System'] = 'System';
25-
$wb['Client'] = 'Client';
26-
$wb['Email'] = 'Email';
27-
$wb['Monitor'] = 'Monitor';
28-
$wb['Sites'] = 'Sites';
29-
$wb['DNS'] = 'DNS';
30-
$wb['Tools'] = 'Tools';
31-
$wb['Help'] = 'Help';
3224
$wb['toolsarea_head_txt'] = 'Tools';
3325
$wb['page_and_txt'] = 'and';
26+
$wb['top_menu_system'] = 'System';
27+
$wb['top_menu_client'] = 'Client';
28+
$wb['top_menu_email'] = 'Email';
29+
$wb['top_menu_monitor'] = 'Monitor';
30+
$wb['top_menu_sites'] = 'Sites';
31+
$wb['top_menu_dns'] = 'DNS';
32+
$wb['top_menu_tools'] = 'Tools';
33+
$wb['top_menu_help'] = 'Help';
3434
?>

0 commit comments

Comments
 (0)