From fd714a7560a919d062ce8d8dbb9324aeb3e655b6 Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Wed, 24 Aug 2011 08:37:52 +0000 Subject: improved i18n --- h-source/Application/Controllers/GenericController.php | 14 +++++++------- h-source/Application/Include/languages.php | 17 +++++++++++++++-- h-source/Application/Views/Hardware/left.php | 2 +- h-source/Application/Views/differences.php | 2 +- h-source/Application/Views/page.php | 2 +- h-source/Application/Views/top_left.php | 14 +++++++------- 6 files changed, 32 insertions(+), 19 deletions(-) diff --git a/h-source/Application/Controllers/GenericController.php b/h-source/Application/Controllers/GenericController.php index c2e6517..5cc81a5 100644 --- a/h-source/Application/Controllers/GenericController.php +++ b/h-source/Application/Controllers/GenericController.php @@ -73,7 +73,7 @@ class GenericController extends BaseController $data['notice'] = null; $data['submission_response'] = 'error'; - $data['tree'] = $this->getSpecHardLink() . " » " . " insert"; + $data['tree'] = $this->getSpecHardLink() . " » " . " ".gtext("Insert").""; $this->s['registered']->checkStatus(); @@ -249,7 +249,7 @@ class GenericController extends BaseController $name = encodeUrl($ne_name); $data['name'] = $name; $data['ne_name'] = $ne_name; - $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($clean['id_hard'],$ne_name) . " » edit"; + $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($clean['id_hard'],$ne_name) . " » ".gtext("Edit").""; if (isset($_POST['updateAction'])) { @@ -563,7 +563,7 @@ class GenericController extends BaseController $data['id'] = $clean['id']; $data['ne_name'] = $this->m['HardwareModel']->getTheModelName($clean['id']); $data['name'] = encodeUrl($data['ne_name']); - $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($clean['id'],$data['ne_name'])." » history"; + $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($clean['id'],$data['ne_name'])." » ".gtext("History").""; $data['title'] = 'history - '.Website::$generalName; @@ -628,7 +628,7 @@ class GenericController extends BaseController $data['ne_name'] = $this->m['HardwareModel']->getTheModelName($data['id_hard']); $data['name'] = encodeUrl($data['ne_name']); - $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($data['id_hard'],$data['ne_name'])." » " . $this->getHistoryLink($data['id_hard']) . " » revision"; + $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($data['id_hard'],$data['ne_name'])." » " . $this->getHistoryLink($data['id_hard']) . " » ".gtext("Revision").""; $data['updated_by'] = $data['table'][0]['revisions']['updated_by']; $data['update_date'] = $data['table'][0]['revisions']['update_date']; @@ -652,7 +652,7 @@ class GenericController extends BaseController $data['id_hard'] = $clean['id_hard']; $ne_name = $this->m['HardwareModel']->getTheModelName((int)$data['id_hard']); $data['name'] = encodeUrl($ne_name); - $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($data['id_hard'],$ne_name)." » " . $this->getHistoryLink($clean['id_hard']) . " » differences"; + $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($data['id_hard'],$ne_name)." » " . $this->getHistoryLink($clean['id_hard']) . " » ".gtext("Differences").""; $data['isDeleted'] = $this->m['HardwareModel']->isDeleted($clean['id_hard']); $data['showDiff'] = false; @@ -783,7 +783,7 @@ class GenericController extends BaseController $data['id_hard'] = $clean['id_hard']; $data['ne_name'] = $this->m['HardwareModel']->getTheModelName($clean['id_hard']); $data['name'] = encodeUrl($data['ne_name']); - $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($clean['id_hard'],$data['ne_name'])." » talk"; + $data['tree'] = $this->getSpecHardLink() . " » " . $this->getViewLink($clean['id_hard'],$data['ne_name'])." » ".gtext("Talk").""; $data['isDeleted'] = $this->m['HardwareModel']->isDeleted($clean['id_hard']); @@ -829,7 +829,7 @@ class GenericController extends BaseController protected function getHistoryLink($id) { - return "controller.'/history/'.$this->lang.'/'.$id.'/'.$this->viewStatus."'>history"; + return "controller.'/history/'.$this->lang.'/'.$id.'/'.$this->viewStatus."'>".gtext("History").""; } protected function getSpecHardLink() diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index 721af28..a49a015 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -241,7 +241,7 @@ class Lang /*0193*/"This device page has been hidden" => "La pagina di questo dispositivo è stata nascosta", /*0194*/"restore the device page" => "ripristina la pagina", /*0195*/"hide the device page" => "nascondi la pagina", - /*0196*/"Download the xml file of all the scanners in the database" => "Scarica il file xml di tutte le scanner presenti nel database", + /*0196*/"Download the xml file of all the scanners in the database" => "Scarica il file xml di tutti gli scanner presenti nel database", /*0197*/"Special pages for administrators" => "Pagine speciali per gli amministratori", /*0198*/"Special pages for moderators" => "Pagine speciali per i moderatori", /*0199*/"see the page" => "guarda la pagina", @@ -264,7 +264,7 @@ class Lang /*0216*/"works with 3D acceleration" => "funziona con accelerazione 3D", /*0217*/"works, but without 3D acceleration" => "funziona, ma senza accelerazione 3D", /*0218*/"it does not work" => "non funziona", - /*0219*/"Notebooks, netbooks, Tablet PC" => "Notebooks, netbooks, Tablet PC", + /*0219*/"Notebooks, netbooks, tablet PC" => "Notebooks, netbooks, tablet PC", /*0220*/"Wifi cards" => "Schede wifi", /*0221*/"Video cards" => "Schede video", /*0222*/"Printers and multifunction" => "Stampanti e multifunzione", @@ -283,6 +283,19 @@ class Lang /*0235*/"Download" => "Scarica", /*0236*/"Help" => "Aiuto", /*0237*/"List of" => "Lista di", + /*0238*/"talk messages" => "messaggi", + /*0239*/"History" => "Revisioni", + /*0240*/"Revision" => "Revisione", + /*0241*/"This is an old revision of this page, as edited by" => "Questa è una vecchia revisione della pagina, così come è stata modificata da", + /*0242*/"It may differ significantly from the" => "Può differire significativamente dalla", + /*0243*/"Differences between the revision of" => "Differenze tra la revisione del", + /*0244*/"created by" => "creata da", + /*0245*/"and the revision of" => "e la revisione del", + /*0246*/"Notice: the text in red has been deleted from the previous revision, the text in green has been added in this revision and the text in gray has not been changed." => "Nota: il testo in rosso è stato cancellato dalla revisione precedente, il testo in verde è stato aggiunto in questa revisione e il testo in grigio non è stato cambiato", + /*0247*/"Insert" => "Inserisci", + /*0248*/"Edit" => "Modifica", + /*0249*/"Talk page" => "Pagina di discussione", + /*0250*/"Download the xml file of all the ethernet cards in the database" => "Scarica il file xml di tutte le schede ethernet presenti nel database", ), 'es' => array ( diff --git a/h-source/Application/Views/Hardware/left.php b/h-source/Application/Views/Hardware/left.php index 275898d..5390303 100644 --- a/h-source/Application/Views/Hardware/left.php +++ b/h-source/Application/Views/Hardware/left.php @@ -27,7 +27,7 @@
- +
diff --git a/h-source/Application/Views/differences.php b/h-source/Application/Views/differences.php index b3bb292..c634d19 100644 --- a/h-source/Application/Views/differences.php +++ b/h-source/Application/Views/differences.php @@ -25,7 +25,7 @@
- Notice: the text in red has been deleted from the previous revision, the text in green has been added in this revision and the text in gray has not been changed. + Notice: the text in red has been deleted from the previous revision, the text in green has been added in this revision and the text in gray has not been changed.");?>
$text) { ?> diff --git a/h-source/Application/Views/page.php b/h-source/Application/Views/page.php index 6fe3c2f..082357f 100644 --- a/h-source/Application/Views/page.php +++ b/h-source/Application/Views/page.php @@ -33,7 +33,7 @@ action,'revision') === 0) { ?>
- This is an old revision of this page, as edited by getUser($updated_by));?> at . It may differ significantly from the controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision. + getUser($updated_by));?> . controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">.
diff --git a/h-source/Application/Views/top_left.php b/h-source/Application/Views/top_left.php index 94701cb..ee735e6 100644 --- a/h-source/Application/Views/top_left.php +++ b/h-source/Application/Views/top_left.php @@ -99,7 +99,7 @@
- controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>">talk messages: + controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>">:
@@ -116,7 +116,7 @@ action,'history') === 0) { ?>
- History of the controller).' '.$ne_name.'';?> + - controller).' '.$ne_name.'';?>
@@ -127,7 +127,7 @@
- Differences between the revision of , created by getUser($updated_by));?>, and the revision of + , getUser($updated_by));?>,
@@ -148,7 +148,7 @@ action,'revision') === 0) { ?>
- Revision of the controller).' '.$ne_name.'';?> + - controller).' '.$ne_name.'';?>
@@ -158,7 +158,7 @@ action,'insert') === 0) { ?>
- Insert a new controller);?> + - controller);?>
@@ -168,7 +168,7 @@ action,'update') === 0) { ?>
- Edit the controller).' '.$ne_name.'';?> + - controller).' '.$ne_name.'';?>
@@ -178,7 +178,7 @@ action,'talk') === 0) { ?>
- Talk page of the controller).' '.$ne_name.'';?> + - controller).' '.$ne_name.'';?>
-- cgit v1.2.3