Jeremy Newman : move language strings to translation table
Jeremy Newman
jnewman at wine.codeweavers.com
Tue Jan 19 12:45:30 CST 2016
Module: website
Branch: master
Commit: 3ba6819debd39bc5668554a7caaad69c39e6162d
URL: http://source.winehq.org/git/website.git/?a=commit;h=3ba6819debd39bc5668554a7caaad69c39e6162d
Author: Jeremy Newman <jnewman at codeweavers.com>
Date: Tue Jan 19 11:24:12 2016 -0600
move language strings to translation table
---
include/plugins/language.php | 4 ++-
include/whq_data.php | 62 ----------------------------------
site.php | 9 ++---
templates/en/global/xml/trans/lang.xml | 38 +++++++++++++++++++++
4 files changed, 44 insertions(+), 69 deletions(-)
diff --git a/include/plugins/language.php b/include/plugins/language.php
index 8ea917e..45b2ccc 100644
--- a/include/plugins/language.php
+++ b/include/plugins/language.php
@@ -12,8 +12,10 @@ switch ($_PLUGIN['cmd'])
case "list":
foreach ($config->languages as $lang)
{
+ $name = $html->trans_val("lang", "lang", $lang);
+ $change = $html->trans_val("lang", "change", $lang);
echo "<li style=\"background-image: url('{$html->base_url()}/images/lang/{$lang}.png'); background-repeat: no-repeat; padding: 0 0 10px 40px;\">\n".
- " <a href=\"{$html->base_url()}/lang/{$lang}\">{$whq_data->languages[$lang]['name']}</a> · {$whq_data->languages[$lang]['change']}\n".
+ " <a href=\"{$html->base_url()}/lang/{$lang}\">{$name}</a> · {$change}\n".
"</li>\n";
}
break;
diff --git a/include/whq_data.php b/include/whq_data.php
deleted file mode 100644
index b580b81..0000000
--- a/include/whq_data.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- WineHQ
- misc data class
- by Jeremy Newman <jnewman at codeweavers.com>
-*/
-
-class whq_data
-{
- // defines
- public $languages;
-
- // constuctor
- public function __construct ()
- {
- // available languages
- $this->languages = array(
- 'en' => array(
- 'name' => 'English',
- 'change' => 'Change Language'
- ),
- 'de' => array(
- 'name' => 'Deutsch',
- 'change' => 'Sprache ändern'
- ),
- 'es' => array(
- 'name' => 'Español',
- 'change' => 'Cambiar Idioma'
- ),
- 'fr' => array(
- 'name' => 'Français',
- 'change' => 'Changez la langue'
- ),
- 'he' => array(
- 'name' => 'עברית',
- 'change' => 'החלפת השפה'
- ),
- 'pl' => array(
- 'name' => 'Polski',
- 'change' => 'Zmień język'
- ),
- 'pt' => array(
- 'name' => 'Português',
- 'change' => 'Mudar a língua'
- ),
- 'tr' => array(
- 'name' => 'Türkçe',
- 'change' => 'Lisan Değiştir'
- ),
- 'uk' => array(
- 'name' => 'Українська',
- 'change' => 'Змінити мову'
- ),
- 'zh-cn' => array(
- 'name' => '简体中文',
- 'change' => '选择语言'
- )
- );
- }
-}
-?>
diff --git a/site.php b/site.php
index d03f0fc..77b2a56 100644
--- a/site.php
+++ b/site.php
@@ -9,9 +9,6 @@
$file_root = realpath(dirname(__FILE__));
require("{$file_root}/include/incl.php");
-// init data class
-$whq_data = new whq_data();
-
// default page body
$PAGE_body = "";
@@ -244,11 +241,11 @@ $PAGE_vars = array(
'js_postload' => $html->get_header_links('js_post'),
'rss_link' => &$PAGE_rss,
'page_body' => &$PAGE_body,
- 'page_body_class' => &$PAGE_body_class,
+ 'page_body_class' => $PAGE_body_class,
'copyright_year' => date("Y", time()),
'debug_log' => &$PAGE_debug,
- 'langCur' => &$whq_data->languages[$html->lang]['name'],
- 'langChange' => &$whq_data->languages[$html->lang]['change']
+ 'langCur' => $html->trans_val("lang", "lang", $html->lang),
+ 'langChange' => $html->trans_val("lang", "change", $html->lang)
);
// HTTP status headers
diff --git a/templates/en/global/xml/trans/lang.xml b/templates/en/global/xml/trans/lang.xml
new file mode 100644
index 0000000..8b22df7
--- /dev/null
+++ b/templates/en/global/xml/trans/lang.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<trans lang="en" table="lang">
+
+ <!--
+ Language Strings
+ Note: Do not copy and translate this file. Simply
+ add your language to it.
+ -->
+
+ <!-- Available Languages -->
+ <str name="lang">
+ <str name="en">English</str>
+ <str name="de">Deutsch</str>
+ <str name="es">Español</str>
+ <str name="fr">Français</str>
+ <str name="he">עברית</str>
+ <str name="pl">Polski</str>
+ <str name="pt">Português</str>
+ <str name="tr">Türkçe</str>
+ <str name="uk">Українська</str>
+ <str name="zh-cn">简体中文</str>
+ </str>
+
+ <!-- Change Language String -->
+ <str name="change">
+ <str name="en">Change Language</str>
+ <str name="de">Sprache ändern</str>
+ <str name="es">Cambiar Idioma</str>
+ <str name="fr">Changez la langue</str>
+ <str name="he">החלפת השפה</str>
+ <str name="pl">Zmień język</str>
+ <str name="pt">Mudar a língua</str>
+ <str name="tr">Lisan Değiştir</str>
+ <str name="uk">Змінити мову</str>
+ <str name="zh-cn">选择语言</str>
+ </str>
+
+</trans>
More information about the wine-cvs
mailing list