From c35eba3676b09d58f3b71c29934853964aaf0a3f Mon Sep 17 00:00:00 2001 From: Antonio Gallo Date: Sun, 4 Dec 2011 20:32:05 +0000 Subject: improved i18n --- h-source/Application/Include/hardware.php | 6 +++--- h-source/Application/Include/languages.php | 14 +++++++++++++- h-source/Application/Models/NotebooksModel.php | 1 + h-source/Application/Views/Notebooks/catalogue.php | 20 ++++++++++---------- h-source/Application/Views/Notebooks/page.php | 18 +++++++++--------- h-source/Application/Views/history.php | 6 +++--- h-source/Public/Css/main.css | 1 + 7 files changed, 40 insertions(+), 26 deletions(-) diff --git a/h-source/Application/Include/hardware.php b/h-source/Application/Include/hardware.php index c3827ad..8c134c9 100644 --- a/h-source/Application/Include/hardware.php +++ b/h-source/Application/Include/hardware.php @@ -170,9 +170,9 @@ class Printer extends Hardware { public static $compatibility = array( - "A Full" => "A-Full", - "B Partial" => "B-Partial", - "C None" => "C-None", + "A-Full" => "A-Full", + "B-Partial" => "B-Partial", + "C-None" => "C-None", ); public static $interface = "not-specified,USB,Serial,Parallel,Firewire,SCSI,Ethernet"; diff --git a/h-source/Application/Include/languages.php b/h-source/Application/Include/languages.php index abdd0f2..7ee011b 100644 --- a/h-source/Application/Include/languages.php +++ b/h-source/Application/Include/languages.php @@ -317,7 +317,7 @@ class Lang /*0269*/"Download the xml file of all the modems in the database" => "Scarica il file xml di tutti i modem presenti nel database", /*0270*/"Modems and ADSL cards" => "Modem e schede ADSL", /*0271*/"Table of contents" => "Indice dei contenuti", - /*0272*/"by" => "da", + /*0272*/"by" => "creato da", /*0273*/"Add a message" => "Aggiungi un messaggio", /*0274*/"Save" => "Salva", /*0275*/"Revision of the wiki page" => "Revisione della pagina della wiki", @@ -343,6 +343,18 @@ class Lang /*0295*/"undef" => "tutti", /*0296*/"All" => "Tutti", /*0297*/"inkjet" => "getto d'inchiostro", + /*0298*/"A-Full" => "A-Piena", + /*0299*/"B-Partial" => "B-Parziale", + /*0300*/"C-None" => "C-Nessuna", + /*0301*/"A-platinum" => "A-platino", + /*0302*/"B-gold" => "B-oro", + /*0303*/"C-silver" => "C-argento", + /*0304*/"D-bronze" => "D-bronzo", + /*0305*/"E-garbage" => "E-spazzatura", + /*0306*/"not specified how it works" => "non è stato specificato come funziona", + /*0307*/"there is no wifi card" => "la scheda wifi non è presente", + /*0308*/"there is no webcam" => "la webcam non è presente", + /*0309*/"it works" => "funziona", ), 'es' => array ( diff --git a/h-source/Application/Models/NotebooksModel.php b/h-source/Application/Models/NotebooksModel.php index ce158a1..bb4f403 100644 --- a/h-source/Application/Models/NotebooksModel.php +++ b/h-source/Application/Models/NotebooksModel.php @@ -84,6 +84,7 @@ class NotebooksModel extends GenericModel { $this->_popupFunctions = array( 'architecture' => 'translate', + 'bios' => 'gtext', ); $this->createPopupWhere('bios,architecture'); diff --git a/h-source/Application/Views/Notebooks/catalogue.php b/h-source/Application/Views/Notebooks/catalogue.php index d2d1125..4648b3d 100644 --- a/h-source/Application/Views/Notebooks/catalogue.php +++ b/h-source/Application/Views/Notebooks/catalogue.php @@ -25,11 +25,11 @@
-
viewArgs['vendor']);?>
-
viewArgs['compatibility']?>
-
viewArgs['comm_year']?>
-
viewArgs['subtype']?>
-
viewArgs['sort-by']?>
+
viewArgs['vendor']));?>
+
viewArgs['compatibility'])?>
+
viewArgs['comm_year'])?>
+
viewArgs['subtype'])?>
+
viewArgs['sort-by'])?>
@@ -38,8 +38,8 @@
-
viewArgs['bios']?>
-
viewArgs['architecture']);?>
+
viewArgs['bios'])?>
+
viewArgs['architecture']));?>
@@ -65,17 +65,17 @@
-
+
:
-
+
:
-
+
diff --git a/h-source/Application/Views/Notebooks/page.php b/h-source/Application/Views/Notebooks/page.php index 6e3db82..98b13cd 100644 --- a/h-source/Application/Views/Notebooks/page.php +++ b/h-source/Application/Views/Notebooks/page.php @@ -51,32 +51,32 @@
:
-
+
:
-
+
-
+
-
+
:
-
+
:
-
">
+
">
@@ -91,17 +91,17 @@
:
-
()
+
()
:
-
()
+
()
:
-
()
+
()
diff --git a/h-source/Application/Views/history.php b/h-source/Application/Views/history.php index 0dea6a6..bacf28a 100644 --- a/h-source/Application/Views/history.php +++ b/h-source/Application/Views/history.php @@ -28,21 +28,21 @@ viewArgs['history_page'] === 1) { ?> -
  • : by getLinkToUserFromId($rev['hardware']['updated_by']);?> (controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff)
    • +
  • : getLinkToUserFromId($rev['hardware']['updated_by']);?> (controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff)
  • - controller."/revision/$lang/".$rev['revisions']['id_rev'].$this->viewStatus;?>"> by getLinkToUserFromId($rev['revisions']['updated_by']);?> + controller."/revision/$lang/".$rev['revisions']['id_rev'].$this->viewStatus;?>"> getLinkToUserFromId($rev['revisions']['updated_by']);?> (controller."/differences/$lang/$id/".$rev['revisions']['id_rev'].$this->viewStatus;?>">diff) - (make current) + ()
    • diff --git a/h-source/Public/Css/main.css b/h-source/Public/Css/main.css index 301be3b..8a1b23f 100644 --- a/h-source/Public/Css/main.css +++ b/h-source/Public/Css/main.css @@ -1850,6 +1850,7 @@ span.entry_label_small { font-weight:normal; font-size:12px; + color:#808080; } .clear_right -- cgit v1.2.3