removed ancient "mark untranslated strings with *" site configuration, as it is unnecessary and breaks links-stream-wrapper and WebDAV

This commit is contained in:
Ralf Becker 2013-07-25 12:18:08 +00:00
parent 71676f982a
commit 59c683c359
24 changed files with 22 additions and 70 deletions

View File

@ -375,7 +375,6 @@ set preference values. admin ca Establir valors per a les preferències
should the login page include a language selectbox (useful for demo-sites) ? admin ca S'hauria d'incloure la selecció d'idioma a la pàgina d'entrada (útil per a llocs de prova) ?
show 'powered by' logo on admin ca Mostrar logo de 'mantingut per' a
show access log admin ca Mostrar registre d'accés
show an asterisk (*) to mark untranslated strings admin ca Mostra un asterisc (*) per marcar sèries no traduïdes
show current action admin ca Mostrar acció actual
show error log admin ca Mostrar registre d'errors
show phpinfo() admin ca Mostrar phpinfo()

View File

@ -212,7 +212,7 @@ email address admin cs e-mailová adresa
enable admin cs povolit
enable debug-messages admin cs Povolit debugovací zprávy
enable the soap service admin cs Povolit službu soap
enable the spellcheck in the ritch text editor ? admin cs Povolit kontrolu pravopisu v richtext editoru?
enable spellcheck in rich text editor admin cs Povolit kontrolu pravopisu v richtext editoru?
enable the xmlrpc service admin cs Povolit službu xmlrpc
enabled - hidden from navbar admin cs Povoleno - Skryto z navigační lišty
enabled - popup window admin cs Povoleno - Překryvné okno
@ -462,7 +462,6 @@ should exceptions contain a trace (including function arguments) admin cs Mají
should the login page include a language selectbox (useful for demo-sites) ? admin cs Má přihlašovací stránka zobrazovat rozbalovací nabídku s výběrem jazyka (užitečné pro demo stránky)?
show 'powered by' logo on admin cs Zobrazovat logo 'založeno na' na
show access log admin cs Zobrazit přístupový protokol
show an asterisk (*) to mark untranslated strings admin cs Zobrazovat hvězdičku (*) u nepřeložených textů
show current action admin cs Zobrazit aktuální akci
show error log admin cs Zobrazit chybový protokol
show phpinfo() admin cs Zobrazit phpinfo()

View File

@ -242,7 +242,7 @@ empty to not change admin de leer lassen um NICHT zu ändern
enable admin de einschalten
enable debug-messages admin de Debug-Meldungen einschalten
enable the soap service admin de soap Service einschalten
enable the spellcheck in the ritch text editor ? admin de Aktiviere die Rechtschreibprüfung im RichText Editor
enable spellcheck in rich text editor admin de Aktiviere die Rechtschreibprüfung im RichText Editor
enable the xmlrpc service admin de xmlrpc Service einschalten
enabled - hidden from navbar admin de Verfügbar, aber nicht in der Navigationsleiste
enabled - popup window admin de Verfügbar, Popup-Fenster
@ -530,7 +530,6 @@ should exceptions contain a trace (including function arguments) admin de Sollen
should the login page include a language selectbox (useful for demo-sites) ? admin de Soll die Anmeldeseite eine Sprachauswahl beinhalten (nützlich für Demosites) ?
show 'powered by' logo on admin de Zeige "powered by" Logo
show access log admin de Zugangsprotokoll anzeigen
show an asterisk (*) to mark untranslated strings admin de Zeige einen Stern (*) um nicht übersetzte Texte zu markieren
show current action admin de aktuelle Aktion anzeigen
show error log admin de Fehlerprotokoll anzeigen
show phpinfo() admin de phpinfo() anzeigen

View File

@ -365,7 +365,6 @@ set preference values. admin el Καθορισμός τιμών προτιμίσ
should the login page include a language selectbox (useful for demo-sites) ? admin el Θα έπρεπε η σελίδα εισόδου να περιέχει ένα κουτί επιλογής (χρήσιμο για demo-sites);
show 'powered by' logo on admin el Εμφάνηση λογότυπου 'powered by'
show access log admin el Εμφάνηση καταγραφής συνδέσεων
show an asterisk (*) to mark untranslated strings admin el Εμφάνιση αστερίσκου (*) ως σημείωση αμετάφραστων στοιχειοσειρών
show current action admin el Εμφάνηση τρέχουσας ενέργειας
show error log admin el Εμφάνηση καταγραφή λαθών
show phpinfo() admin el Εμφάνηση phpinfo()

View File

@ -243,7 +243,7 @@ empty to not change admin en empty to NOT change
enable admin en Enable
enable debug-messages admin en Enable debug messages.
enable the soap service admin en Enable the soap service.
enable the spellcheck in the ritch text editor ? admin en Enable the spellcheck in the rich text editor.
enable spellcheck in rich text editor admin en Enable spellcheck in rich text editor
enable the xmlrpc service admin en Enable the xmlrpc service.
enabled - hidden from navbar admin en Enabled - Hidden from navbar
enabled - popup window admin en Enabled - Popup window
@ -531,7 +531,6 @@ should exceptions contain a trace (including function arguments) admin en Should
should the login page include a language selectbox (useful for demo-sites) ? admin en Show language select box on login page.
show 'powered by' logo on admin en Show 'powered by' logo on
show access log admin en Show access log
show an asterisk (*) to mark untranslated strings admin en Show an asterisk (*) to mark untranslated strings
show current action admin en Show current action
show error log admin en Show error log
show phpinfo() admin en Show phpinfo()

View File

@ -237,7 +237,7 @@ email address admin es-es dirección de correo electrónico
enable admin es-es Activar
enable debug-messages admin es-es Activar mensajes de depuración
enable the soap service admin es-es Activar el servicio soap
enable the spellcheck in the ritch text editor ? admin es-es ¿Activar la corrección ortográfica en el editor de texto enriquecido?
enable spellcheck in rich text editor admin es-es ¿Activar la corrección ortográfica en el editor de texto enriquecido?
enable the xmlrpc service admin es-es Activar el servicio xmlrpc
enabled - hidden from navbar admin es-es Habilitado - Esconder de la barra de navegación
enabled - popup window admin es-es Habilitado - Ventana emergente
@ -520,7 +520,6 @@ should exceptions contain a trace (including function arguments) admin es-es Las
should the login page include a language selectbox (useful for demo-sites) ? admin es-es ¿Debe incluir la página de inicio de sesión un cuadro de selección de idioma (útil para sitios de demostración)?
show 'powered by' logo on admin es-es Mostrar logo de 'Diseñado con' en
show access log admin es-es Mostrar registro de acceso
show an asterisk (*) to mark untranslated strings admin es-es Mostrar un asterisco (*) para marcar las cadenas sin traducir
show current action admin es-es Mostrar acción actual
show error log admin es-es Mostrar registro de errores
show phpinfo() admin es-es Mostrar phpinfo()

View File

@ -221,7 +221,7 @@ email address admin fi Sähköpostiosoite
enable admin fi Ota käyttöön
enable debug-messages admin fi Näytä virheenjäljitysviestit
enable the soap service admin fi Salli SOAP palvelut
enable the spellcheck in the ritch text editor ? admin fi Salli oikolukuohjelma Rich text editorissa.
enable spellcheck in rich text editor admin fi Salli oikolukuohjelma Rich text editorissa.
enable the xmlrpc service admin fi Salli XMLRPC palvelut
enabled - hidden from navbar admin fi Käytössä - Ei näy työkalupalkissa
enabled - popup window admin fi Käytössä - Ponnahdusikkuna
@ -492,7 +492,6 @@ set preference values. admin fi Tee asetukset.
should the login page include a language selectbox (useful for demo-sites) ? admin fi Näytetäänkö kirjautumisnäytöllä kielien valintalista (käytännöllinen esittelyjä varten) ?
show 'powered by' logo on admin fi 'Tämä on' -logon paikka
show access log admin fi Näytä käyttöloki
show an asterisk (*) to mark untranslated strings admin fi Näytä tähti (*) merkki kääntämättön osion kohdalla
show current action admin fi Näytä viimeisin toimi
show error log admin fi Näytä virheloki
show phpinfo() admin fi Näytä phpinfo()

View File

@ -233,7 +233,7 @@ email address admin fr adresse email
enable admin fr Activer
enable debug-messages admin fr Activer les messages de déboguage
enable the soap service admin fr Activer le service soap
enable the spellcheck in the ritch text editor ? admin fr Activer la vérification d'orthographe dans l'éditeur de texte riche.
enable spellcheck in rich text editor admin fr Activer la vérification d'orthographe dans l'éditeur de texte riche.
enable the xmlrpc service admin fr Activer le service xmlrp
enabled - hidden from navbar admin fr Activé - caché de la barre de navigation
enabled - popup window admin fr Activé - Fenêtre popup
@ -514,7 +514,6 @@ should exceptions contain a trace (including function arguments) admin fr Les ex
should the login page include a language selectbox (useful for demo-sites) ? admin fr Est-ce que la page de login doit inclure une zone de sélection linguistique (utile aussi pour les sites de démonstration)
show 'powered by' logo on admin fr Montrer le logo 'motorisé par' sur
show access log admin fr Montrer les journaux d'accès
show an asterisk (*) to mark untranslated strings admin fr Afficher une astérisque (*) pour marquer les chaines non traduites.
show current action admin fr Montrer les actions en cours
show error log admin fr Montrer le journal des erreurs
show phpinfo() admin fr Montrer phpinfo()

View File

@ -384,7 +384,6 @@ set preference values. admin hu Set preference values.
should the login page include a language selectbox (useful for demo-sites) ? admin hu A Bejelentkező képernyő tartalmazzon Nyelv választási lehetőséget (hasznos pl. a demo oldal esetén)?
show 'powered by' logo on admin hu 'Powered by' logó megjelenítése
show access log admin hu Hozzáférési napló megjelenítése
show an asterisk (*) to mark untranslated strings admin hu Fordítással nem rendelkező szövegek megjelölése csillaggal (*)
show current action admin hu Jelenlegi művelet megjelenítése
show error log admin hu Hibanapló megjelenítése
show phpinfo() admin hu phpinfo() megjelenítése

View File

@ -269,7 +269,6 @@ server url admin id Server URL
server username admin id Server Username
set preference values. admin id Set preference values.
show access log admin id Tampilkan log akses
show an asterisk (*) to mark untranslated strings admin id Show an asterisk (*) to mark untranslated strings
show current action admin id Tampilkan tindakan saat ini
show error log admin id Tampilkan log error
show phpinfo() admin id Tampilkan phpinfo()

View File

@ -234,7 +234,7 @@ email address admin it Indirizzo email
enable admin it Abilita
enable debug-messages admin it Attiva i messaggi di debug
enable the soap service admin it Attiva servizio soap
enable the spellcheck in the ritch text editor ? admin it Abilita il controllo ortografico nell'editor di testo
enable spellcheck in rich text editor admin it Abilita il controllo ortografico nell'editor di testo
enable the xmlrpc service admin it Attiva servizio xmlrpc
enabled - hidden from navbar admin it Attivo - nascosto dalla barra di navigazione
enabled - popup window admin it Attivo - Finestra Popup
@ -515,7 +515,6 @@ should exceptions contain a trace (including function arguments) admin it Le ecc
should the login page include a language selectbox (useful for demo-sites) ? admin it Includere nella pagina di login un elenco a discesa per selezionare la lingua (utile per i siti-demo) ?
show 'powered by' logo on admin it Visualizza il logo 'creato con'
show access log admin it Visualizza i log di accesso
show an asterisk (*) to mark untranslated strings admin it Visualizza con un asterisco le righe non tradotte
show current action admin it Visualizza l'azione corrente
show error log admin it Visualizza i log di errore
show phpinfo() admin it Visualizza phpinfo()

View File

@ -207,7 +207,7 @@ email account active admin lo email ບັນຊີທີ່ໃຊ້ຢູ່
email address admin lo ທີ່ຢູ່ email
enable debug-messages admin lo ເປິດການໃຊ້ debug-messages
enable the soap service admin lo ເປິດການໃຊ້ບໍລິການ soap
enable the spellcheck in the ritch text editor ? admin lo ເປິດການໃຊ້ການກວດແກ້ຄໍໍາສັບ?
enable spellcheck in rich text editor admin lo ເປິດການໃຊ້ການກວດແກ້ຄໍໍາສັບ?
enable the xmlrpc service admin lo ເປິດການໃຊ້ບໍລິການ xmlrpc
enabled - hidden from navbar admin lo ໄດ້ເປິດໃຊ້ Hidden ຈາກ navbar
enabled - popup window admin lo ໄດ້ເປິດໃຊ້ Popup Window
@ -453,7 +453,6 @@ should exceptions contain a trace (including function arguments) admin lo ຄວ
should the login page include a language selectbox (useful for demo-sites) ? admin lo ໜ້າຈໍລ໋ອກອິນຄວນມີຊ່ອງເລືອກພາສາ(ໃຊ້ສໍາລັບ demo-sites)
show 'powered by' logo on admin lo Show 'powered by' logo on
show access log admin lo ສະແດງການເຂົ້າໃຊ້ງານລະບົບ
show an asterisk (*) to mark untranslated strings admin lo ສະແດງເຄືອງໝາຍ(*)ເພື່ອບອກວ່າປະໂຫຍກທີ່ບໍ່ໄດ້ມີການແປ
show current action admin lo ສະແດງການເຮັດວຽກປັດຈຸບັນ
show error log admin lo ສະແດງລ໋ອກຟາຍຂໍ້ຜິດພາດ
show phpinfo() admin lo ສະແດງຂໍ້ມູນຂອງ php (phpinfo())

View File

@ -204,7 +204,7 @@ email address admin nl emailadres
enable admin nl inschakelen
enable debug-messages admin nl Debugberichten activeren
enable the soap service admin nl De SOAP service inschakelen
enable the spellcheck in the ritch text editor ? admin nl Schakel de spellingcontrole in de Rich Text Editor in?
enable spellcheck in rich text editor admin nl Schakel de spellingcontrole in de Rich Text Editor in?
enable the xmlrpc service admin nl De XML-RPC service inschakelen
enabled - hidden from navbar admin nl Ingeschakeld - niet zichtbaar op de navigatiebalk
enabled - popup window admin nl Ingeschakeld - Popup Window
@ -424,7 +424,6 @@ should exceptions contain a trace (including function arguments) admin nl Moeten
should the login page include a language selectbox (useful for demo-sites) ? admin nl Moet de login pagina een taalkeuze box bevatten (handig voor demo sites) ?
show 'powered by' logo on admin nl ''Powered by'-logo weergeven op
show access log admin nl Toegangslogboek weergeven
show an asterisk (*) to mark untranslated strings admin nl Toon een sterretje (*) om onvertaalde teksten te markeren
show current action admin nl Huidige actie weergeven
show error log admin nl Foutenlogboek weergeven
show phpinfo() admin nl De uitvoer van phpinfo() weergeven

View File

@ -213,7 +213,7 @@ email address admin pl adres email
enable admin pl włącz
enable debug-messages admin pl Wyświetlaj komunikaty trybu debug
enable the soap service admin pl Włącz serwis SOAP
enable the spellcheck in the ritch text editor ? admin pl Włączyć sprawdzanie pisowni w edytorze tekstowym ?
enable spellcheck in rich text editor admin pl Włączyć sprawdzanie pisowni w edytorze tekstowym ?
enable the xmlrpc service admin pl Włącz serwis XMLRPC
enabled - hidden from navbar admin pl Aktywna - ukryta w menu
enabled - popup window admin pl Aktywna - Okno Popup
@ -464,7 +464,6 @@ should exceptions contain a trace (including function arguments) admin pl Czy wy
should the login page include a language selectbox (useful for demo-sites) ? admin pl Czy strona zalogowania powinna zawiera box z wyborem języka (przydatne dla serwerów demo) ?
show 'powered by' logo on admin pl Wyświetl logo 'powered by'
show access log admin pl Wyświetl dziennik dostępów
show an asterisk (*) to mark untranslated strings admin pl Pokazuj gwiazdkę (*) aby oznaczać nieprzetłumaczone frazy
show current action admin pl Pokaż bieżącą akcję
show error log admin pl Wśywietl dziennik błędów
show phpinfo() admin pl Wyświetl phpinfo()

View File

@ -202,7 +202,7 @@ email address admin pt-br e-mail
enable admin pt-br habilitado
enable debug-messages admin pt-br Habilitar menssagens de depuração
enable the soap service admin pt-br Habilitar o serviço soap
enable the spellcheck in the ritch text editor ? admin pt-br Habilitar o verificador ortográfico no editor de texto ?
enable spellcheck in rich text editor admin pt-br Habilitar o verificador ortográfico no editor de texto ?
enable the xmlrpc service admin pt-br Habilitar o serviço xmlrpc
enabled - hidden from navbar admin pt-br Habilitado - Escondido da barra de navegação
enabled - popup window admin pt-br Habilitar Janelas instantâneas
@ -419,7 +419,6 @@ set preference values. admin pt-br Definir preferências.
should the login page include a language selectbox (useful for demo-sites) ? admin pt-br A tela de conexão deve incluír uma caixa de seleção de idioma? (útil para sites de demonstração)
show 'powered by' logo on admin pt-br Área para exibição de 'powered by eGroupWare'
show access log admin pt-br Exibir registros de acessos
show an asterisk (*) to mark untranslated strings admin pt-br Exibe um asterisco (*) para marcar as frases não traduzidas
show current action admin pt-br Exibir ação corrente
show error log admin pt-br Exibir registro de erros
show phpinfo() admin pt-br Exibir phpinfo()

View File

@ -243,7 +243,7 @@ empty to not change admin ru Пусто, чтобы НЕ менять
enable admin ru Разрешить
enable debug-messages admin ru Разрешить отладочные сообщения
enable the soap service admin ru Разрешить сервис soap
enable the spellcheck in the ritch text editor ? admin ru Включить проверку орфографии в редакторе?
enable spellcheck in rich text editor admin ru Включить проверку орфографии в редакторе?
enable the xmlrpc service admin ru Разрешить сервис xmlrpc
enabled - hidden from navbar admin ru Разрешено - скрыть с панели навигации
enabled - popup window admin ru Разрешено - всплывающее окно
@ -528,7 +528,6 @@ should exceptions contain a trace (including function arguments) admin ru Иск
should the login page include a language selectbox (useful for demo-sites) ? admin ru Отображать на входной странице поле выбора языка (полезно для демо-сайта)?
show 'powered by' logo on admin ru Показать логотип разработчика системы «Под управлением…»
show access log admin ru Показать журнал доступа
show an asterisk (*) to mark untranslated strings admin ru Отмечать непереведённые строки звёздочкой (*)
show current action admin ru Показать текущее действие
show error log admin ru Показать журнал ошибок
show phpinfo() admin ru Показать информацию php

View File

@ -232,7 +232,7 @@ email address admin sk E-mailová adresa
enable admin sk Zapnúť
enable debug-messages admin sk Zapnúť ladiace správy
enable the soap service admin sk Zapnúť službu SOAP
enable the spellcheck in the ritch text editor ? admin sk Zapnúť kontrolu pravopisu v textovom editore?
enable spellcheck in rich text editor admin sk Zapnúť kontrolu pravopisu v textovom editore?
enable the xmlrpc service admin sk Zapnúť službu XMLRPC
enabled - hidden from navbar admin sk Zapnuté - Skryté v navigačnom paneli
enabled - popup window admin sk Zapnuté - Vyskakovacie okno
@ -513,7 +513,6 @@ should exceptions contain a trace (including function arguments) admin sk Chcete
should the login page include a language selectbox (useful for demo-sites) ? admin sk Chcete, aby sa na prihlasovacej stránke zobrazoval výber jazyka (vhodné pre demo-stránky)?
show 'powered by' logo on admin sk Kde zobrazovať logo "powered by"
show access log admin sk Zobraziť prístupové záznamy
show an asterisk (*) to mark untranslated strings admin sk Použiť hviezdičku (*) na označenie nepreložených fráz
show current action admin sk Zobraziť aktuálnu akciu
show error log admin sk Zobraziť záznamy o chybách
show phpinfo() admin sk Zobraziť phpinfo()

View File

@ -385,7 +385,6 @@ set preference values. admin sl Vnesite vrednosti nastavitev.
should the login page include a language selectbox (useful for demo-sites) ? admin sl Ali naj vstopna stran vsebuje možnost izbire jezika (uporabno za demo-strani) ?
show 'powered by' logo on admin sl Pokaži 'teče na' logotip na
show access log admin sl Pokaži evidenco dostopov
show an asterisk (*) to mark untranslated strings admin sl Pokaži zvezdico (*) za označitev neprevedenih nizov
show current action admin sl Pokaži trenutno dejanje
show error log admin sl Pokaži seznam napak
show phpinfo() admin sl Pokaži phpinfo() informacije

View File

@ -378,7 +378,6 @@ set preference values. admin zh-tw 設定偏好值
should the login page include a language selectbox (useful for demo-sites) ? admin zh-tw 登入畫面要不要包含語言選單(利於展示)
show 'powered by' logo on admin zh-tw 顯示「powered by」圖示位置
show access log admin zh-tw 顯示存取紀錄
show an asterisk (*) to mark untranslated strings admin zh-tw 在未翻譯字串顯示星號 (*)
show current action admin zh-tw 顯示現在動作
show error log admin zh-tw 顯示錯誤紀錄
show phpinfo() admin zh-tw 顯示PHP資訊

View File

@ -422,7 +422,6 @@ set preference values. admin zh 设置偏好参数。
should the login page include a language selectbox (useful for demo-sites) ? admin zh 登录页需要包含语言选单吗 (有益于站点演示)
show 'powered by' logo on admin zh 显示 'Powered by' 标示在
show access log admin zh 显示访问日志
show an asterisk (*) to mark untranslated strings admin zh 在未翻译字串标记星号 (*)
show current action admin zh 显示当前操作
show error log admin zh 显示错误日志
show phpinfo() admin zh 显示 phpinfo()

View File

@ -102,24 +102,14 @@
</tr>
<tr class="row_off">
<td>{lang_Show_an_asterisk_(*)_to_mark_untranslated_strings}:</td>
<td>
<select name="newsettings[markuntranslated]">
<option value="">{lang_No}</option>
<option value="yes" {selected_markuntranslated_yes}>{lang_Yes}</option>
</select>
</td>
</tr>
<tr class="row_on">
<td>{lang_How_big_should_thumbnails_for_linked_images_be_(maximum_in_pixels)_?}:</td>
<td>
<input name="newsettings[link_list_thumbnail]" value="{value_link_list_thumbnail}" size="5">
</td>
</tr>
<tr class="row_off">
<td>{lang_Enable_the_spellcheck_in_the_ritch_text_editor_?}:</td>
<tr class="row_on">
<td>{lang_Enable_spellcheck_in_rich_text_editor}:</td>
<td>
<select name="newsettings[enabled_spellcheck]">
<option value="">{lang_No}</option>

View File

@ -112,16 +112,13 @@ class jscalendar
static $chars_shortcut;
if (is_null($chars_shortcut)) $chars_shortcut = (int)lang('3 number of chars for month-shortcut'); // < 0 to take the chars from the end
$markuntranslated = translation::$markuntranslated;
translation::$markuntranslated = true; // otherwise we can not detect NOT translated phrases!
$short = lang($m = adodb_date('M',$ts)); // check if we have a translation of the short-cut
$short = translation::translate($m = adodb_date('M',$ts), null, '*'); // check if we have a translation of the short-cut
if ($substr($short,-1) == '*') // if not generate one by truncating the translation of the long name
{
$short = $chars_shortcut > 0 ? $substr(lang(adodb_date('F',$ts)),0,$chars_shortcut) :
$substr(lang(adodb_date('F',$ts)),$chars_shortcut);
}
$date = str_replace(adodb_date('M',$ts),$short,$date);
translation::$markuntranslated = $markuntranslated;
}
}
if ($helpmsg !== '')
@ -260,8 +257,6 @@ egw_LAB.wait(function() {
{
return False;
}
$markuntranslated = translation::$markuntranslated;
translation::$markuntranslated = true; // otherwise we can not detect NOT translated phrases!
$fields = preg_split('/[.\\/-]/',$datestr);
foreach(preg_split('/[.\\/-]/',$this->dateformat) as $n => $field)
{
@ -273,7 +268,7 @@ egw_LAB.wait(function() {
for($i = 1; $i <= 12; $i++)
{
$long_name = lang(adodb_date('F',mktime(12,0,0,$i,1,2000)));
$short_name = lang(adodb_date('M',mktime(12,0,0,$i,1,2000))); // do we have a translation of the short-cut
$short_name = translation::translate(adodb_date('M',mktime(12,0,0,$i,1,2000)), null, '*'); // do we have a translation of the short-cut
if (substr($short_name,-1) == '*') // if not generate one by truncating the translation of the long name
{
$short_name = substr($long_name,0,(int) lang('3 number of chars for month-shortcut'));
@ -299,7 +294,6 @@ egw_LAB.wait(function() {
}
$date[$field] = (int)$fields[$n];
}
translation::$markuntranslated = $markuntranslated;
$ret = array(
$year => $date['Y'],

View File

@ -71,12 +71,6 @@ class translation
* @var egw_db
*/
static $db;
/**
* Mark untranslated strings with an asterisk (*)
*
* @var boolean
*/
static $markuntranslated=false;
/**
* System charset
@ -177,7 +171,6 @@ class translation
ini_set('mbstring.internal_encoding',self::$system_charset);
}
}
self::$markuntranslated = (boolean) $GLOBALS['egw_info']['server']['markuntranslated'];
// try loading load_via from tree-wide cache and check if it contains more rules
if (($load_via = egw_cache::getTree(__CLASS__, 'load_via')) &&
@ -226,18 +219,18 @@ class translation
* translates a phrase and evtl. substitute some variables
*
* @param string $key phrase to translate, may contain placeholders %N (N=1,2,...) for vars
* @param array/boolean $vars=false vars to replace the placeholders, or false for none
* @param array $vars=null vars to replace the placeholders, or null for none
* @param string $not_found='*' what to add to not found phrases, default '*'
* @return string with translation
*/
static function translate($key, $vars=false, $not_found='*' )
static function translate($key, $vars=null, $not_found='' )
{
if (!self::$lang_arr)
{
self::init();
}
$ret = $key; // save key if we dont find a translation
if ($not_found && self::$markuntranslated) $ret .= $not_found;
if ($not_found) $ret .= $not_found;
if (isset(self::$lang_arr[$key]))
{

View File

@ -256,11 +256,9 @@ Calendar._SDN = new Array
static $substr;
if(is_null($substr)) $substr = function_exists('mb_substr') ? 'mb_substr' : 'substr';
$chars_shortcut = (int) lang('3 number of chars for day-shortcut'); // < 0 to take the chars from the end
$markuntranslated = translation::$markuntranslated;
translation::$markuntranslated = true; // otherwise we can not detect NOT translated phrases!
foreach($day2int as $name => $n)
{
$short = lang($m = substr($name,0,3)); // test if our lang-file have a translation for the english short with 3 chars
$short = translation::translate($m=substr($name,0,3), null, '*'); // test if our lang-file have a translation for the english short with 3 chars
if ($substr($short,-1) == '*') // else create one by truncating the full translation to x chars
{
$short = $chars_shortcut > 0 ? $substr(lang($name),0,$chars_shortcut) : $substr(lang($name),$chars_shortcut);
@ -272,7 +270,6 @@ Calendar._SDN_len = <?php echo abs((int) lang('3 number of chars for day-shortcu
Calendar._MN = new Array
(<?php // full month names
translation::$markuntranslated = $markuntranslated;
$monthnames = array('January','February','March','April','May','June','July','August','September','October','November','December');
foreach($monthnames as $n => $name)
{
@ -282,18 +279,16 @@ foreach($monthnames as $n => $name)
Calendar._SMN = new Array
(<?php // short month names
translation::$markuntranslated = true; // otherwise we can not detect NOT translated phrases!
$chars_shortcut = (int)lang('3 number of chars for month-shortcut'); // < 0 to take the chars from the end
foreach($monthnames as $n => $name)
{
$short = lang($m = substr($name,0,3)); // test if our lang-file have a translation for the english short with 3 chars
$short = translation::translate($m=substr($name,0,3), null, '*'); // test if our lang-file have a translation for the english short with 3 chars
if ($substr($short,-1) == '*') // else create one by truncating the full translation to x chars
{
$short = $chars_shortcut > 0 ? $substr(lang($name),0,$chars_shortcut) : $substr(lang($name),$chars_shortcut);
}
echo "\n \"".$short.'"'.($n < 11 ? ',' : '');
}
translation::$markuntranslated = $markuntranslated;
?>);
Calendar._SMN_len = <?php echo abs((int) lang('3 number of chars for month-shortcut')); ?>;