From bdfb482046c8b6976820b4b686086471ca263b30 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Thu, 10 Jan 2008 22:27:38 +0000
Subject: [PATCH] rbarreiros: #1907 - Patch for more i18n strings
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47849 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
forms/TableListField.php | 16 ++++++++++---
lang/en_US.php | 43 +++++++++++++++++++++++++++++++++
lang/pt_PT.php | 42 +++++++++++++++++++++++++++++++++
misc/Statistics.php | 51 ++++++++++++++++++++++++++++++----------
4 files changed, 136 insertions(+), 16 deletions(-)
diff --git a/forms/TableListField.php b/forms/TableListField.php
index a143458d7..0a87ffe46 100755
--- a/forms/TableListField.php
+++ b/forms/TableListField.php
@@ -854,13 +854,13 @@ JS
$links = new DataObjectSet();
if($this->can('export')) {
$links->push(new ArrayData(array(
- 'Title' => 'Export to CSV',
+ 'Title' => _t('TableListField.CSVEXPORT', 'Export to CSV'),
'Link' => $this->ExportLink()
)));
}
if($this->can('print')) {
$links->push(new ArrayData(array(
- 'Title' => 'Print',
+ 'Title' => _t('TableListField.PRINT', 'Print'),
'Link' => $this->PrintLink()
)));
}
@@ -895,14 +895,24 @@ JS
}
function Title() {
+ // adding translating functionality
+ // this is a bit complicated, because this parameter is passed to this class
+ // and should come here translated already
+ // adding this to TODO probably add a method to the classes
+ // to return they're translated string
+ // added by ruibarreiros @ 27/11/2007
return singleton($this->sourceClass)->singular_name();
}
function NameSingular() {
- return singleton($this->sourceClass)->singular_name();
+ // same as Title()
+ // added by ruibarreiros @ 27/11/2007
+ return singleton($this->sourceClass)->singular_name();
}
function NamePlural() {
+ // same as Title()
+ // added by ruibarreiros @ 27/11/2007
return singleton($this->sourceClass)->plural_name();
}
diff --git a/lang/en_US.php b/lang/en_US.php
index 9784fc9d5..0bae9d28e 100644
--- a/lang/en_US.php
+++ b/lang/en_US.php
@@ -350,4 +350,47 @@ $lang['en_US']['ChangePasswordEmail.ss']['CHANGEPASSWORDTEXT1'] = array(
$lang['en_US']['ChangePasswordEmail.ss']['CHANGEPASSWORDTEXT2'] = 'You can now use the following credentials to log in:';
$lang['en_US']['ForgotPasswordEmail.ss']['HELLO'] = 'Hi';
+// New2
+
+$lang['en_US']['TableField.ss']['ADD'] = 'Add a new row';
+$lang['en_US']['TableField.ss']['ADDITEM'] = 'Add';
+$lang['en_US']['TableField.ss']['DELETEROW'] = 'Delete this row';
+$lang['en_US']['TableField.ss']['DELETE'] = 'delete';
+
+$lang['en_US']['Security']['MEMBERALREADYEXISTS'] = 'There already exists a member with this identity URL';
+$lang['en_US']['Security']['OPENIDURL'] = 'OpenID URL/i-name';
+$lang['en_US']['Security']['OPENIDDESC'] = '<p>Make sure you enter your normalized OpenID/i-name credentials
+ here, i.e. with protocol and trailing slash for OpenID (e.g. http://openid.silverstripe.com/).</p>';
+$lang['en_US']['Security']['OPENIDHEADER'] = 'OpenID/i-name credentials';
+$lang['en_US']['Security']['EDITOPENIDURL'] = 'OpenID URL/i-name (e.g. http://openid.silverstripe.com/)';
+$lang['en_US']['Security']['OPENIDURLNORMALIZATION'] = '<p>Make sure you enter your normalized OpenID/i-name credentials
+ here, i.e. with protocol and trailing slash for OpenID (e.g. http://openid.silverstripe.com/).</p>';
+
+$lang['en_US']['TableListField']['CSVEXPORT'] = 'Export to CSV';
+$lang['en_US']['TableListField']['PRINT'] = 'Print';
+
+$lang['en_US']['Permission']['FULLADMINRIGHTS'] = 'Full administrative rights';
+
+$lang['en_US']['Page']['CLASSNAME'] = 'Page';
+
+$lang['en_US']['Statistics']['TRENDS'] = 'Trends';
+$lang['en_US']['Statistics']['LEGEND'] = 'Legend';
+$lang['en_US']['Statistics']['BROWSERS'] = 'Browsers';
+$lang['en_US']['Statistics']['ID'] = 'ID';
+$lang['en_US']['Statistics']['EMAIL'] = 'Email';
+$lang['en_US']['Statistics']['JOINED'] = 'Joined';
+$lang['en_US']['Statistics']['REGISTEREDUSERS'] = 'Registered Users';
+$lang['en_US']['Statistics']['CSVEXPORT'] = 'Export as CSV';
+
+$lang['en_US']['Statistics']['RECENTPAGEVIEWS'] = 'Recent Page Views';
+$lang['en_US']['Statistics']['TIME'] = 'Time';
+$lang['en_US']['Statistics']['BROWSER'] = 'Browser';
+$lang['en_US']['Statistics']['OSABREV'] = 'OS';
+$lang['en_US']['Statistics']['USER'] = 'User';
+$lang['en_US']['Statistics']['PAGE'] = 'Page';
+$lang['en_US']['Statistics']['PAGEVIEWS'] = 'Page Views';
+$lang['en_US']['Statistics']['OS'] = 'Operating Systems';
+$lang['en_US']['Statistics']['USERACTIVITY'] = 'User Activity';
+
+
?>
\ No newline at end of file
diff --git a/lang/pt_PT.php b/lang/pt_PT.php
index 7aaf64f00..661a86614 100644
--- a/lang/pt_PT.php
+++ b/lang/pt_PT.php
@@ -616,4 +616,46 @@ $lang['pt_PT']['TableListField_PageControls.ss']['DISPLAYING'] = 'A Mostrar';
$lang['pt_PT']['TableListField_PageControls.ss']['TO'] = 'até';
$lang['pt_PT']['TableListField_PageControls.ss']['OF'] = 'de';
+// New2
+
+$lang['pt_PT']['TableField.ss']['ADD'] = 'Adicionar nova linha';
+$lang['pt_PT']['TableField.ss']['ADDITEM'] = 'Adicionar';
+$lang['pt_PT']['TableField.ss']['DELETEROW'] = 'Apagar esta linha';
+$lang['pt_PT']['TableField.ss']['DELETE'] = 'apagar';
+
+$lang['pt_PT']['Security']['OPENIDHEADER'] = 'Credenciais OpenID/i-name';
+$lang['pt_PT']['Security']['MEMBERALREADYEXISTS'] = 'Já existe um utilizador com esta identidade';
+$lang['pt_PT']['Security']['OPENIDURL'] = 'OpenID URL/i-name';
+$lang['pt_PT']['Security']['OPENIDDESC'] = '<p>Certifique-se que inseriu aqui as suas credenciais OpenID/i-name normalizadas
+ , p.ex. com protocolo e barra para a direita para o OpenID (ex. http://openid.silverstripe.com/).</p>';
+$lang['pt_PT']['Security']['EDITOPENIDURL'] = 'OpenID URL/i-name (ex. http://openid.silverstripe.com/)';
+$lang['pt_PT']['Security']['OPENIDURLNORMALIZATION'] = '<p>Certifique-se que inseriu aqui as suas credenciais OpenID/i-name normalizadas
+ , p.ex. com protocolo e barra para a direita para o OpenID (ex. http://openid.silverstripe.com/).</p>';
+
+$lang['pt_PT']['TableListField']['CSVEXPORT'] = 'Exportar para CSV';
+$lang['pt_PT']['TableListField']['PRINT'] = 'Imprimir';
+
+$lang['pt_PT']['Permission']['FULLADMINRIGHTS'] = 'Permissões de administração total';
+
+$lang['pt_PT']['Page']['CLASSNAME'] = 'Página';
+
+$lang['pt_PT']['Statistics']['TRENDS'] = 'Tendências';
+$lang['pt_PT']['Statistics']['LEGEND'] = 'Legenda';
+$lang['pt_PT']['Statistics']['BROWSERS'] = 'Browsers';
+$lang['pt_PT']['Statistics']['ID'] = 'ID';
+$lang['pt_PT']['Statistics']['EMAIL'] = 'Email';
+$lang['pt_PT']['Statistics']['JOINED'] = 'Creado em';
+$lang['pt_PT']['Statistics']['REGISTEREDUSERS'] = 'Utilizadores Registados';
+$lang['pt_PT']['Statistics']['CSVEXPORT'] = 'Exportar como CSV';
+$lang['pt_PT']['Statistics']['RECENTPAGEVIEWS'] = 'Visualização Recente de Páginas';
+$lang['pt_PT']['Statistics']['TIME'] = 'Data/Hora';
+$lang['pt_PT']['Statistics']['BROWSER'] = 'Browser';
+$lang['pt_PT']['Statistics']['OSABREV'] = 'SO';
+$lang['pt_PT']['Statistics']['USER'] = 'Utilizador';
+$lang['pt_PT']['Statistics']['PAGE'] = 'Página';
+$lang['pt_PT']['Statistics']['PAGEVIEWS'] = 'Visualizações';
+$lang['pt_PT']['Statistics']['OS'] = 'Sistemas Operativos';
+$lang['pt_PT']['Statistics']['USERACTIVITY'] = 'Actividade dos Utilizadores';
+
+
?>
\ No newline at end of file
diff --git a/misc/Statistics.php b/misc/Statistics.php
index f5cbc0b4d..d10036e60 100644
--- a/misc/Statistics.php
+++ b/misc/Statistics.php
@@ -16,11 +16,13 @@ class Statistics extends Controller {
}
static function trend_chart($table, $filter = "day", $name, $type, $color) {
+ $trendstrl = _t('Statistics.TRENDS', 'Trends');
+ $legendtrl = _t('Statistics.LEGEND', 'Legend');
$top = <<<HTML
<div id="trendchart" style="display: none">
-<h2>Trends</h2>
+<h2>{$trendstrl}</h2>
<div><canvas id="chart" height="400" width="700"></canvas></div>
-<div id="chart_legend"><legend>Legend</legend></div>
+<div id="chart_legend"><legend>{$legendtrl}</legend></div>
</div>
<script type="text/javascript">\n
HTML;
@@ -144,13 +146,18 @@ HTML;
static function user_record_table() {
$records = DataObject::get('Member');
$baseURL = Director::baseURL();
+ $registereduserstrl = _t('Statistics.REGISTEREDUSERS', 'Registered Users');
+ $exporttrl = _t('Statistics.CSVEXPORT', 'Export as CSV');
+ $idtrl = _t('Statistics.ID', 'ID');
+ $emailtrl = _t('Statistics.EMAIL', 'Email');
+ $joinedtrl = _t('Statistics.JOINED');
$top = <<<HTML
<div id="usertable" style="display: none">
- <h2>Registered Users</h2>
- <p><a href="$baseURL/admin/statistics/usercsv">Export as CSV</a></p>
+ <h2>{$registereduserstrl}</h2>
+ <p><a href="$baseURL/admin/statistics/usercsv">{$exporttrl}</a></p>
<table class="sortable-onload-1 rowstyle-alt no-arrow paginate-10 statstable" border="0" cellspacing="1" cellpadding="0">
<thead>
- <tr><th class="sortable-numeric">ID</th><th class="sortable-text">Email</th><th class="sortable-sortDatetime">Joined</th></tr>
+ <tr><th class="sortable-numeric">{$idtrl}</th><th class="sortable-text">{$emailtrl}</th><th class="sortable-sortDatetime">{$joinedtrl}</th></tr>
</thead>
<tbody>
HTML;
@@ -179,12 +186,19 @@ HTML;
static function get_recent_views($limit = 15) {
$records = DataObject::get('PageView', null, 'Created DESC', null, $limit);
+ $recentpvtrl = _t('Statistics.RECENTPAGEVIEWS', 'Recent Page Views');
+ $idtrl = _t('Statistics.ID', 'ID');
+ $timetrl = _t('Statistics.TIME', 'Time');
+ $browsertrl = _t('Statistics.BROWSER', 'Browser');
+ $ostrl = _t('Statistics.OSABREV', 'OS');
+ $usertrl = _t('Statistics.USER', 'User');
+ $pagetrl = _t('Statistics.PAGE', 'Page');
$top = <<<HTML
<div id="recentviewtable">
- <h2>Recent Page Views</h2>
+ <h2>{$recentpvtrl}</h2>
<table class="sortable-onload-1 rowstyle-alt no-arrow paginate-10 statstable" border="0" cellspacing="1" cellpadding="0">
<thead>
- <tr><th class="sortable-numeric">ID</th><th class="sortable-sortDatetime">Time</th><th class="sortable-text">Browser</th><th class="sortable-text">OS</th><th>User</th><th class="sortable-text">Page</th></tr>
+ <tr><th class="sortable-numeric">{$idtrl}</th><th class="sortable-sortDatetime">{$timetrl}</th><th class="sortable-text">{$browsertrl}</th><th class="sortable-text">{$ostrl}</th><th>{$usertrl}</th><th class="sortable-text">{$pagetrl}</th></tr>
</thead>
<tbody>
HTML;
@@ -258,13 +272,21 @@ HTML;
$records = DataObject::get('PageView');
}
$baseURL = Director::baseURL();
+ $pageviewstrl = _t('Statistics.PAGEVIEWS', 'Page Views');
+ $idtrl = _t('Statistics.ID', 'ID');
+ $timetrl = _t('Statistics.TIME', 'Time');
+ $browsertrl = _t('Statistics.BROWSER', 'Browser');
+ $ostrl = _t('Statistics.OSABREV', 'OS');
+ $usertrl = _t('Statistics.USER', 'User');
+ $pagetrl = _t('Statistics.PAGE', 'Page');
+ $exporttrl = _t('Statistics.CSVEXPORT', 'Export as CSV');
$top = <<<HTML
<div id="viewtable" style="display: none">
- <h2>Page Views</h2>
- <p><a href="$baseURL/admin/statistics/viewcsv">Export as CSV</a></p>
+ <h2>{$pageviewstrl}</h2>
+ <p><a href="$baseURL/admin/statistics/viewcsv">{$exporttrl}</a></p>
<table class="sortable-onload-1 rowstyle-alt no-arrow paginate-10 statstable" border="0" cellspacing="1" cellpadding="0">
<thead>
- <tr><th class="sortable-numeric">ID</th><th class="sortable-sortDatetime">Time</th><th class="sortable-text">Browser</th><th class="sortable-text">OS</th><th class="sortable-text">User</th><th class="sortable-text">Page</th></tr>
+ <tr><th class="sortable-numeric">{$idtrl}</th><th class="sortable-sortDatetime">{$timetrl}</th><th class="sortable-text">{$browsertrl}</th><th class="sortable-text">{$ostrl}</th><th class="sortable-text">{$usertrl}</th><th class="sortable-text">{$pagetrl}</th></tr>
</thead>
<tbody>
HTML;
@@ -288,9 +310,10 @@ HTML;
}
static function browser_chart($type = "Pie", $color = "blue") {
+ $browserstrl = _t('Statistics.BROWSERS', 'Browsers');
$top = <<<HTML
<div id="browserchart" style="display: none">
-<h2>Browsers</h2>
+<h2>{$browserstrl}</h2>
<div><canvas id="bchart" height="400" width="700"></canvas></div>
</div>
@@ -351,9 +374,10 @@ HTML;
}
static function os_chart($type = "Pie", $color = "blue") {
+ $ostrl = _t('Statistics.OS', 'Operating Systems');
$top = <<<HTML
<div id="oschart" style="display: none">
-<h2>Operating Systems</h2>
+<h2>{$ostrl}</h2>
<div><canvas id="ochart" height="400" width="700"></canvas></div>
</div>
@@ -414,9 +438,10 @@ HTML;
}
static function activity_chart($type = "Pie", $color = "blue") {
+ $useracttrl = _t('Statistics.USERACTIVITY', 'User Activity');
$top = <<<HTML
<div id="uacchart" style="display: none">
-<h2>User Activity</h2>
+<h2>{$useracttrl}</h2>
<div><canvas id="uchart" height="400" width="700"></canvas></div>
</div>