From 3307109a1cb1db51a2cc7301ee07f65d515a8f96 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 6 Jul 2009 11:11:40 +0000 Subject: [PATCH] reverted change of r72366 and fixed the real cause for the mainscreen_message problem: YOU SHOULD NOT HAVE TRANSLATIONS FOR mainscreen_message; You may have to force the reload of new language file-information --- home/setup/egw_cs.lang | 1 - home/setup/egw_de.lang | 1 - home/setup/egw_en.lang | 1 - home/setup/egw_es-es.lang | 1 - home/setup/egw_fi.lang | 1 - home/setup/egw_fr.lang | 1 - home/setup/egw_it.lang | 1 - home/setup/egw_iw.lang | 1 - home/setup/egw_nl.lang | 1 - home/setup/egw_pt-br.lang | 1 - home/setup/egw_pt.lang | 1 - home/setup/egw_ru.lang | 1 - home/setup/egw_sk.lang | 1 - home/setup/egw_sl.lang | 1 - home/setup/egw_sv.lang | 1 - home/setup/egw_zh-tw.lang | 1 - home/setup/egw_zh.lang | 1 - phpgwapi/inc/class.translation.inc.php | 8 +------- 18 files changed, 1 insertion(+), 24 deletions(-) diff --git a/home/setup/egw_cs.lang b/home/setup/egw_cs.lang index 2e129d8997..2a426c7c4c 100644 --- a/home/setup/egw_cs.lang +++ b/home/setup/egw_cs.lang @@ -1,5 +1,4 @@ displays home home cs Zobrazuje hlavní stranu egroupware home cs eGroupWare home home cs Hlavní strana -mainscreen_message home cs mainscreen_message there is a new version of egroupware available home cs Je k dispozici nová verze eGroupWare diff --git a/home/setup/egw_de.lang b/home/setup/egw_de.lang index 00f0b4daee..ab09ff2ab4 100644 --- a/home/setup/egw_de.lang +++ b/home/setup/egw_de.lang @@ -1,5 +1,4 @@ displays home home de Home anzeigen egroupware home de EGRoupware home home de Home -mainscreen_message home de Meldung auf dem Hauptbildschirm there is a new version of egroupware available home de Es steht eine neuere Version von EGroupware zur Verfügung diff --git a/home/setup/egw_en.lang b/home/setup/egw_en.lang index faebcf9e3b..25720123a1 100755 --- a/home/setup/egw_en.lang +++ b/home/setup/egw_en.lang @@ -1,5 +1,4 @@ displays home home en Displays home egroupware home en eGroupWare home home en Home -mainscreen_message home en mainscreen_message there is a new version of egroupware available home en There is a new version of eGroupWare available diff --git a/home/setup/egw_es-es.lang b/home/setup/egw_es-es.lang index 4f54d8de1e..d9c35efa64 100644 --- a/home/setup/egw_es-es.lang +++ b/home/setup/egw_es-es.lang @@ -1,5 +1,4 @@ displays home home es-es Muestra el inicio egroupware home es-es eGroupWare home home es-es Inicio -mainscreen_message home es-es Mensaje de la pantalla principal there is a new version of egroupware available home es-es Hay disponible una nueva versión de eGroupWare diff --git a/home/setup/egw_fi.lang b/home/setup/egw_fi.lang index 924884e4ef..d3b5e107d2 100644 --- a/home/setup/egw_fi.lang +++ b/home/setup/egw_fi.lang @@ -1,5 +1,4 @@ displays home home fi Näytä etusivu egroupware home fi eGroupWare home home fi Etusivu -mainscreen_message home fi mainscreen_message there is a new version of egroupware available home fi Uudempi versio eGroupWaresta on saatavilla diff --git a/home/setup/egw_fr.lang b/home/setup/egw_fr.lang index b93ef9906d..80d7a2770b 100644 --- a/home/setup/egw_fr.lang +++ b/home/setup/egw_fr.lang @@ -1,5 +1,4 @@ displays home home fr Afficher l'écran d'accueil egroupware home fr eGroupWare home home fr Accueil -mainscreen_message home fr Ecran principal des messages there is a new version of egroupware available home fr Une nouvelle version de eGroupWare est disponible diff --git a/home/setup/egw_it.lang b/home/setup/egw_it.lang index fbb9a66992..459d750764 100644 --- a/home/setup/egw_it.lang +++ b/home/setup/egw_it.lang @@ -1,5 +1,4 @@ displays home home it Mostra home egroupware home it eGroupware home home it Home -mainscreen_message home it Messaggio principale there is a new version of egroupware available home it C'è una nuova versione di eGroupWare disponibile diff --git a/home/setup/egw_iw.lang b/home/setup/egw_iw.lang index 21ad3bc471..81400d29a7 100644 --- a/home/setup/egw_iw.lang +++ b/home/setup/egw_iw.lang @@ -1,5 +1,4 @@ displays home home iw test egroupware home iw sdg home home iw gsg -mainscreen_message home iw sgs there is a new version of egroupware available home iw sgsg diff --git a/home/setup/egw_nl.lang b/home/setup/egw_nl.lang index 39b5ade374..d70954398c 100755 --- a/home/setup/egw_nl.lang +++ b/home/setup/egw_nl.lang @@ -1,5 +1,4 @@ displays home home nl Toont start egroupware home nl eGroupware home home nl Start -mainscreen_message home nl Bericht op startscherm there is a new version of egroupware available home nl Er is een nieuwe versie van eGroupWare beschikbaar diff --git a/home/setup/egw_pt-br.lang b/home/setup/egw_pt-br.lang index ace93d2d85..6fb820b0b1 100644 --- a/home/setup/egw_pt-br.lang +++ b/home/setup/egw_pt-br.lang @@ -1,5 +1,4 @@ displays home home pt-br Exibe Página Inicial egroupware home pt-br eGroupWare home home pt-br Página Inicial -mainscreen_message home pt-br Mensagem da tela principal there is a new version of egroupware available home pt-br Há uma nova versão do eGroupWare disponível diff --git a/home/setup/egw_pt.lang b/home/setup/egw_pt.lang index 53464e3d2e..36cad744a5 100644 --- a/home/setup/egw_pt.lang +++ b/home/setup/egw_pt.lang @@ -1,2 +1 @@ -mainscreen_message home pt Mensagem de boas vindas! there is a new version of egroupware available home pt Existe uma nova versão do eGroupWare disponível diff --git a/home/setup/egw_ru.lang b/home/setup/egw_ru.lang index c7cf68dbd6..30498e4796 100644 --- a/home/setup/egw_ru.lang +++ b/home/setup/egw_ru.lang @@ -1,5 +1,4 @@ displays home home ru Показать дом egroupware home ru eGroupWare home home ru Домой -mainscreen_message home ru Сообщение основного экрана (?) there is a new version of egroupware available home ru Доступна новая версия eGroupWare diff --git a/home/setup/egw_sk.lang b/home/setup/egw_sk.lang index e141364459..cf007b31e4 100644 --- a/home/setup/egw_sk.lang +++ b/home/setup/egw_sk.lang @@ -1,5 +1,4 @@ displays home home sk Zobrazí Domov egroupware home sk eGroupWare home home sk Domov -mainscreen_message home sk -domovská stránka- there is a new version of egroupware available home sk Existuje už novšia verzia eGroupWare diff --git a/home/setup/egw_sl.lang b/home/setup/egw_sl.lang index 3b841a15f0..cf7b0719e8 100644 --- a/home/setup/egw_sl.lang +++ b/home/setup/egw_sl.lang @@ -1,5 +1,4 @@ displays home home sl Prikaže domačo stran egroupware home sl eGroupWare home home sl Domov -mainscreen_message home sl Sporočilo uvodnega zaslona there is a new version of egroupware available home sl Na voljo je nova različica eGroupWare-a diff --git a/home/setup/egw_sv.lang b/home/setup/egw_sv.lang index adbe09b041..a9ba4bf7b9 100644 --- a/home/setup/egw_sv.lang +++ b/home/setup/egw_sv.lang @@ -1,5 +1,4 @@ displays home home sv Visar Hemsidan egroupware home sv eGroupWare home home sv Hem -mainscreen_message home sv Hemsidan meddelanden there is a new version of egroupware available home sv En uppdaterad version av eGroupWare är tillgänglig diff --git a/home/setup/egw_zh-tw.lang b/home/setup/egw_zh-tw.lang index 336f1c33c6..55d82a4e8b 100644 --- a/home/setup/egw_zh-tw.lang +++ b/home/setup/egw_zh-tw.lang @@ -1,5 +1,4 @@ displays home home zh-tw 顯示首頁 egroupware home zh-tw eGroupWare home home zh-tw 首頁 -mainscreen_message home zh-tw 首頁訊息 there is a new version of egroupware available home zh-tw eGroupWare 有新版本推出了 diff --git a/home/setup/egw_zh.lang b/home/setup/egw_zh.lang index 95f8727c92..e69bc78aed 100644 --- a/home/setup/egw_zh.lang +++ b/home/setup/egw_zh.lang @@ -1,5 +1,4 @@ displays home home zh 显示首页 egroupware home zh eGroupWare home home zh 首页 -mainscreen_message home zh 主窗口讯息 there is a new version of egroupware available home zh eGroupWare 有最新版本推出 diff --git a/phpgwapi/inc/class.translation.inc.php b/phpgwapi/inc/class.translation.inc.php index 0237686ca4..27e9d15589 100644 --- a/phpgwapi/inc/class.translation.inc.php +++ b/phpgwapi/inc/class.translation.inc.php @@ -251,13 +251,7 @@ class translation // for loginscreen we have to use a instance specific cache! $loaded =& egw_cache::getCache(in_array($app,self::$instance_specific_translations) ? egw_cache::INSTANCE : egw_cache::TREE, __CLASS__,$app.':'.$lang,array(__CLASS__,'load_app'),array($app,$lang)); - foreach(array_keys($loaded) as $key) - { - // as array_merge does renumber, and the padding of the loaded langs to the existing langs does lead to strange phenomenons - // regarding the mainscreen_message, we do that the old fashioned way. - if (!empty($loaded[$key])) self::$lang_arr[$key] = $loaded[$key]; - } - //self::$lang_arr += $loaded; // use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge + self::$lang_arr += $loaded; // use += instead of array_merge, as we have phrases with numerical index, which get renumbered by array_merge self::$loaded_apps[$app] = $lang; //error_log(__METHOD__."($app,$lang) took ".(1000*(microtime(true)-$start))." ms, loaded ".count($loaded)." phrases -> total=".count(self::$lang_arr).": ".function_backtrace()); }