- user web: clean up LANG_NAME_* mess

svn path=/trunk/boinc/; revision=20248
This commit is contained in:
David Anderson 2010-01-22 18:09:05 +00:00
parent a4627588d6
commit 03be4edeab
4 changed files with 61 additions and 39 deletions

View File

@ -622,3 +622,11 @@ Bernd 22 Jan 2010
lib/
Makefile.am
David 22 Jan 2010
- user web: clean up LANG_NAME_* mess
html/
ops/
build_po_boinc.php
user/
language_select.php

View File

@ -31,10 +31,11 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\\n"
msgid "LANG_NAME_NATIVE"
msgstr "English"
msgstr ""
msgid "LANG_NAME_INTERNATIONAL"
msgstr "English"
msgstr ""
HDR;

View File

@ -40,14 +40,35 @@ if ($set_lang){
page_head(tra("Language selection"));
function language_name($code) {
if ($code == 'en') {
return "<em>en</em> (English)";
} else {
$lname = tr_specific("LANG_NAME_NATIVE", $code);
if ($lname == 'English' || $lname == '') {
return "<b>$code</b>";
} else {
return "<b>$code</b> ("
.tr_specific("LANG_NAME_INTERNATIONAL", $code)
."/$lname)"
;
}
}
}
if (count($languages_in_use)) {
$cur_lang_name = language_name($languages_in_use[0]);
} else {
echo "foo";
$cur_lang_name = language_name('en');
}
echo "<p>",
tra(
"This web site is available in several languages. The currently selected language is: %1 (%2).",
"<em>".tra("LANG_NAME_INTERNATIONAL")."</em>",
tra("LANG_NAME_NATIVE")
"This web site is available in several languages. The currently selected language is %1.",
$cur_lang_name
),
"</p>",
"<p>",
"</p><p>",
tra(
"Normally the choice of language is determined by your browser's language setting, which is: %1. You can change this setting using:",
"<b>$prefs</b>"
@ -66,18 +87,21 @@ echo "<p>",
;
start_table();
row2(tra("Language symbol"), tra("Language name (click to select)"));
row2("",
"<a href=language_select.php?set_lang=auto>".tra("Use browser language setting")."</a>"
row1(tra("Language name (click to select)"));
row1("<a href=language_select.php?set_lang=auto>"
.tra("Use browser language setting")
."</a>",
1, "row1"
);
sort($languages);
$i = 0;
foreach ($languages as $language) {
$inter = tr_specific("LANG_NAME_INTERNATIONAL", $language);
$native = tr_specific("LANG_NAME_NATIVE", $language);
row2(
"<a href=\"language_select.php?set_lang=$language\">$language</a>",
"<a href=\"language_select.php?set_lang=$language\">$inter ($native)</a>"
$name = language_name($language);
row1(
"<a href=\"language_select.php?set_lang=$language\">$name</a>",
1, "row$i"
);
$i = 1-$i;
}
end_table();
echo "<p>",

View File

@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: BOINC $Id$\n"
"Report-Msgid-Bugs-To: BOINC translation team <boinc_loc@boinc.berkeley.edu>\n"
"POT-Creation-Date: 2010-01-20 12:49 PST\n"
"POT-Creation-Date: 2010-01-22 10:06 PST\n"
"Last-Translator: Generated automatically from source files\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@ -17,10 +17,11 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
msgid "LANG_NAME_NATIVE"
msgstr "English"
msgstr ""
msgid "LANG_NAME_INTERNATIONAL"
msgstr "English"
msgstr ""
#: ../inc/forum.inc:124
msgid "Search for words in forum messages"
msgstr ""
@ -1472,54 +1473,42 @@ msgstr ""
msgid "Language selection"
msgstr ""
#: ../user/language_select.php:46
msgid "LANG_NAME_INTERNATIONAL"
msgstr ""
#: ../user/language_select.php:47
msgid "LANG_NAME_NATIVE"
msgstr ""
#: ../user/language_select.php:45
#: ../user/language_select.php:68
msgid ""
"This web site is available in several languages. The currently selected "
"language is: %1 (%2)."
"language is %1."
msgstr ""
#: ../user/language_select.php:52
#: ../user/language_select.php:73
msgid ""
"Normally the choice of language is determined by your browser's language "
"setting, which is: %1. You can change this setting using:"
msgstr ""
#: ../user/language_select.php:57
#: ../user/language_select.php:78
msgid "Firefox: Tools/Options/General"
msgstr ""
#: ../user/language_select.php:59
#: ../user/language_select.php:80
msgid "Microsoft IE: Tools/Internet Options/Languages"
msgstr ""
#: ../user/language_select.php:63
#: ../user/language_select.php:84
msgid ""
"Or you can select a language by clicking on one of the links. This will "
"send your browser a cookie; make sure your browser accepts cookies from our "
"domain."
msgstr ""
#: ../user/language_select.php:69
msgid "Language symbol"
msgstr ""
#: ../user/language_select.php:69
#: ../user/language_select.php:90
msgid "Language name (click to select)"
msgstr ""
#: ../user/language_select.php:71
#: ../user/language_select.php:92
msgid "Use browser language setting"
msgstr ""
#: ../user/language_select.php:84
#: ../user/language_select.php:108
msgid ""
"Translations are done by volunteers. If your native language is not here, %"
"1you can provide a translation%2."