From e2266c20039dc7ee91c09f16fda8d659db3c276e Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Sat, 07 Jul 2012 05:52:58 -0400
Subject: [PATCH] moved uppercase handling for "LOGOUT" link from hardcoding to **.lng files to tmpl_var parameter
---
interface/lib/lang/fr.lng | 2
interface/lib/lang/nl.lng | 2
interface/lib/lang/sk.lng | 2
interface/lib/lang/ro.lng | 2
interface/lib/lang/el.lng | 2
interface/web/themes/default/templates/main.tpl.htm | 2
interface/lib/lang/ja.lng | 2
interface/lib/lang/bg.lng | 2
interface/lib/lang/pt.lng | 2
interface/lib/lang/id.lng | 2
interface/lib/lang/se.lng | 16 ++++----
interface/lib/lang/ar.lng | 60 +++++++++++++++---------------
interface/lib/lang/ru.lng | 2
interface/lib/lang/pl.lng | 2
interface/lib/lang/br.lng | 2
interface/lib/lang/cz.lng | 2
interface/web/themes/default-v2/templates/main.tpl.htm | 2
interface/lib/lang/de.lng | 2
interface/lib/lang/es.lng | 2
interface/lib/lang/hu.lng | 2
interface/lib/lang/it.lng | 2
interface/lib/lang/fi.lng | 2
interface/lib/lang/tr.lng | 2
23 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
index 430cb2e..2a53e4b 100644
--- a/interface/lib/lang/ar.lng
+++ b/interface/lib/lang/ar.lng
@@ -7,36 +7,36 @@
$wb['number_format_decimals'] = '2';
$wb['number_format_dec_point'] = '.';
$wb['number_format_thousands_sep'] = '';
-$wb['error_301'] = '��� ����� ����� ����������.';
-$wb['error_302'] = '������ ��� �����.';
-$wb['error_1001'] = '�� ���� ���� �������� ������ ������ �� ����� �������!';
-$wb['error_1002'] = '��� �������� �/�� ���� ������ ��� �����!';
-$wb['error_1003'] = '��� ����� ��� ��������!';
-$wb['delete_confirmation'] = '�� ��� ���� ��� ��� �����';
-$wb['error_no_view_permission'] = '�� ���� ���� ����� ���� ��� ����� �� �� ����� ��� ��� �����!';
-$wb['error_no_delete_permission'] = '�� ���� ���� ����� ���� ��� �����!';
-$wb['page_txt'] = '����';
-$wb['page_of_txt'] = '��';
-$wb['page_and_txt'] = '�';
-$wb['page_next_txt'] = '������';
-$wb['page_back_txt'] = '�����';
-$wb['delete_txt'] = '���';
-$wb['filter_txt'] = '�����';
-$wb['add_new_record_txt'] = '����� ��� ����';
-$wb['btn_save_txt'] = '���';
-$wb['btn_cancel_txt'] = '�����';
-$wb['top_menu_system'] = '������';
-$wb['top_menu_client'] = '������';
-$wb['top_menu_email'] = '������ ����������';
-$wb['top_menu_monitor'] = '��������';
-$wb['top_menu_sites'] = '�������';
-$wb['top_menu_dns'] = '����� ��������';
-$wb['top_menu_tools'] = '�������';
-$wb['top_menu_help'] = '��������';
-$wb['top_menu_billing'] = '�������';
-$wb['top_menu_domain'] = '��������';
-$wb['top_menu_dashboard'] = '�������';
-$wb['toolsarea_head_txt'] = '�����';
+$wb['error_301'] = 'ÛíÑ ãÓãæÍ ááÚÖæ ÈÇáÅÓÊÎÏÇã.';
+$wb['error_302'] = 'ÇáæÍÏÉ ÛíÑ ÕÇáÍÉ.';
+$wb['error_1001'] = 'áÇ íãßä áÇÓã ÇáãÓÊÎÏã ÃæßáãÉ ÇáãÑæÑ Çä íßæäÇ ÝÇÑÛÊíä!';
+$wb['error_1002'] = 'ÇÓã ÇáãÓÊÎÏã æ/Ãæ ßáãÉ ÇáãÑæÑ ÛíÑ ÕÍíÍÉ!';
+$wb['error_1003'] = 'íÊã ÅíÞÇÝ ÇÓã ÇáãÓÊÎÏã!';
+$wb['delete_confirmation'] = 'åá ÍÞÇ ÊÑíÏ ÍÐÝ åÐÇ ÇáÓÌá¿';
+$wb['error_no_view_permission'] = 'áÇ íæÌÏ áÏíß ÇáÅÐä áÚÑÖ åÐÇ ÇáÓÌá Ãæ Çä ÇáÓÌá åÐÇ ÛíÑ ãæÌæÏ!';
+$wb['error_no_delete_permission'] = 'áÇ íæÌÏ áÏíß ÇáÅÐä áÍÐÝ åÐÇ ÇáÓÌá!';
+$wb['page_txt'] = 'ÕÝÍÉ';
+$wb['page_of_txt'] = 'ãä';
+$wb['page_and_txt'] = 'æ';
+$wb['page_next_txt'] = 'ÇáÊÇáí';
+$wb['page_back_txt'] = 'ááÎáÝ';
+$wb['delete_txt'] = 'ÍÐÝ';
+$wb['filter_txt'] = 'ãÕÝÇÉ';
+$wb['add_new_record_txt'] = 'ÅÖÇÝÉ ÓÌá ÌÏíÏ';
+$wb['btn_save_txt'] = 'ÍÝÙ';
+$wb['btn_cancel_txt'] = 'ááÎáÝ';
+$wb['top_menu_system'] = 'ÇáäÙÇã';
+$wb['top_menu_client'] = 'ÇáÚãíá';
+$wb['top_menu_email'] = 'ÇáÈÑíÏ ÇáÇáßÊÑæäí';
+$wb['top_menu_monitor'] = 'ÇáãÑÇÞÈÉ';
+$wb['top_menu_sites'] = 'ÇáãæÇÞÚ';
+$wb['top_menu_dns'] = 'ÃÓãÇÁ ÇáäØÇÞÇÊ';
+$wb['top_menu_tools'] = 'ÇÚÏÇÏÇÊ';
+$wb['top_menu_help'] = 'ÇáãÓÇÚÏÉ';
+$wb['top_menu_billing'] = 'ÇáÝæÊÑÉ';
+$wb['top_menu_domain'] = 'ÇáãÌÇáÇÊ';
+$wb['top_menu_dashboard'] = 'ÇáÑÆíÓÉ';
+$wb['toolsarea_head_txt'] = 'ÃÏæÇÊ';
$wb['latest_news_txt'] = 'Latest news';
$wb['top_menu_vm'] = 'VServer';
$wb['datepicker_nextText'] = 'Next';
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index 19897e4..803b6c4 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_oct'] = 'Oct';
$wb['monthnamesshort_nov'] = 'Nov';
$wb['monthnamesshort_dec'] = 'Dec';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
index c912859..1bd45e7 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index f471f32..4226f6f 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 94525d3..219247f 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -69,7 +69,7 @@
$wb['monthnamesshort_dec'] = 'Dez';
$wb['datepicker_nextText'] = 'Vor';
$wb['datepicker_prevText'] = 'Zurück';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['submit_confirmation'] = 'Wollen Sie diese Aktion wirlich ausführen?';
$wb['globalsearch_resultslimit_of_txt'] = "von";
$wb['globalsearch_resultslimit_results_txt'] = "Treffern";
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index e609330..4e41fed 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -68,6 +68,6 @@
$wb['monthnamesshort_nov'] = 'Νοε';
$wb['monthnamesshort_dec'] = 'Δεκ';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index 3461b2a..6e0b213 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index 2dbaec7..6e8757c 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index 9e2da96..bfd861d 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Suivant';
$wb['datepicker_prevText'] = 'Précédent';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
index 399acb4..c490d98 100644
--- a/interface/lib/lang/hu.lng
+++ b/interface/lib/lang/hu.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
index f2455e0..0cc70c1 100644
--- a/interface/lib/lang/id.lng
+++ b/interface/lib/lang/id.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index f92f557..0b568f2 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
index f305ed4..e6a4e68 100644
--- a/interface/lib/lang/ja.lng
+++ b/interface/lib/lang/ja.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_oct'] = 'Oct';
$wb['monthnamesshort_nov'] = 'Nov';
$wb['monthnamesshort_dec'] = 'Dec';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 6245c23..ca75070 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index f582331..62bf59f 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Gru';
$wb['datepicker_nextText'] = 'Nast';
$wb['datepicker_prevText'] = 'Poprz';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
index f22754c..679dab0 100644
--- a/interface/lib/lang/pt.lng
+++ b/interface/lib/lang/pt.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
index 0442688..0173163 100644
--- a/interface/lib/lang/ro.lng
+++ b/interface/lib/lang/ro.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index 97a1677..67796ad 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -68,6 +68,6 @@
$wb['monthnamesshort_nov'] = 'Ноя';
$wb['monthnamesshort_dec'] = 'Дек';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index 2817a5e..faf269e 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -7,14 +7,14 @@
$wb['number_format_decimals'] = '2';
$wb['number_format_dec_point'] = '.';
$wb['number_format_thousands_sep'] = '';
-$wb['error_301'] = 'Modulen �r ej till�ten f�r nuvarande anv�ndare.';
-$wb['error_302'] = 'Modulen �r ogiltig.';
-$wb['error_1001'] = 'Anv�ndarnamn och l�senord f�r ej vara tomma!';
-$wb['error_1002'] = 'Anv�ndarnamnet och/eller l�senordet �r felaktigt!';
-$wb['error_1003'] = 'Detta anv�ndarnamn �r deaktiverat!';
-$wb['delete_confirmation'] = 'Vill du verkligen ta bort detta inl�gg?';
-$wb['error_no_view_permission'] = 'Du har ej beh�righet att se detta inl�gg eller s� existerar den ej!';
-$wb['error_no_delete_permission'] = 'Du har ej beh�righet att ta bort detta inl�gg!';
+$wb['error_301'] = 'Modulen är ej tillåten för nuvarande användare.';
+$wb['error_302'] = 'Modulen är ogiltig.';
+$wb['error_1001'] = 'Användarnamn och lösenord får ej vara tomma!';
+$wb['error_1002'] = 'Användarnamnet och/eller lösenordet är felaktigt!';
+$wb['error_1003'] = 'Detta användarnamn är deaktiverat!';
+$wb['delete_confirmation'] = 'Vill du verkligen ta bort detta inlägg?';
+$wb['error_no_view_permission'] = 'Du har ej behörighet att se detta inlägg eller så existerar den ej!';
+$wb['error_no_delete_permission'] = 'Du har ej behörighet att ta bort detta inlägg!';
$wb['page_txt'] = 'Page';
$wb['page_of_txt'] = 'of';
$wb['page_next_txt'] = 'Next';
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
index dc87285..57059f3 100644
--- a/interface/lib/lang/sk.lng
+++ b/interface/lib/lang/sk.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
index 2066491..78cc717 100644
--- a/interface/lib/lang/tr.lng
+++ b/interface/lib/lang/tr.lng
@@ -67,7 +67,7 @@
$wb['monthnamesshort_dec'] = 'Dec';
$wb['datepicker_nextText'] = 'Next';
$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'LOGOUT';
+$wb['logout_txt'] = 'Logout';
$wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
$wb['submit_confirmation'] = 'Do you really want to perform this action?';
?>
diff --git a/interface/web/themes/default-v2/templates/main.tpl.htm b/interface/web/themes/default-v2/templates/main.tpl.htm
index ca5737b..647aa05 100644
--- a/interface/web/themes/default-v2/templates/main.tpl.htm
+++ b/interface/web/themes/default-v2/templates/main.tpl.htm
@@ -74,7 +74,7 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
+ <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
<tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</tmpl_if>
</nav>
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 929ea3b..a334ba9 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -124,7 +124,7 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
+ <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
<tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</tmpl_if>
</div>
--
Gitblit v1.9.1