From fd714a7560a919d062ce8d8dbb9324aeb3e655b6 Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Wed, 24 Aug 2011 08:37:52 +0000
Subject: improved i18n

---
 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 +++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'h-source/Application/Views')

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 @@
 		</div>
 	
 		<div class="hardware_element">
-			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"><?php echo gtext("Notebooks, netbooks, Tablet PC");?></a>
+			<img align="middle" class="hardware_element_image" src="<?php echo $this->baseUrl;?>/Public/Img/H2O/computer-laptop.png"><a class="hardware_element_link" href="<?php echo $this->baseUrl?>/notebooks/catalogue/<?php echo $lang;?>"><?php echo gtext("Notebooks, netbooks, tablet PC");?></a>
 		</div>
 		
 		<div class="hardware_element">
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 @@
 		<?php if (!$isDeleted) { ?>
 		
 			<div class="diff_color_notice">
-				<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class="gray_text_notice">gray</span> has not been changed.
+				<?php echo gtext("<b>Notice</b>: the text in <del>red</del> has been deleted from the previous revision, the text in <ins>green</ins> has been added in this revision and the text in <span class='gray_text_notice'>gray</span> has not been changed.");?>
 			</div>
 
 			<?php foreach ($diffArray as $label => $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 @@
 			<!--if revision-->
 			<?php if (strcmp($this->action,'revision') === 0) { ?>
 			<div class="revision_alert">
-				This is an old revision of this page, as edited by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> at <b><?php echo smartDate($update_date); ?></b>. It may differ significantly from the <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>">current revision</a>.
+				<?php echo gtext("This is an old revision of this page, as edited by");?> <b><?php echo getLinkToUser($u->getUser($updated_by));?></b> <?php echo gtext('at');?> <b><?php echo smartDate($update_date); ?></b>. <?php echo gtext("It may differ significantly from the");?> <a href="<?php echo $this->baseUrl."/".$this->controller."/view/$lang/$id_hard/".$name.$this->viewStatus;?>"><?php echo gtext("Current revision");?></a>.
 			</div>
 			<?php } ?>
 			
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 @@
 
 			<?php if (!$isDeleted) { ?>
 			<div class="talk_numb_ext">
-				<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>">talk messages: <?php echo $talk_number;?></a>
+				<a href="<?php echo $this->baseUrl."/".$this->controller."/talk/$lang/$id_hard/$token".$this->viewStatus;?>"><?php echo gtext("talk messages");?>: <?php echo $talk_number;?></a>
 			</div>
 			<?php } ?>
 		
@@ -116,7 +116,7 @@
 		<?php } else if (strcmp($this->action,'history') === 0) { ?>
 		
 			<div class="notebook_view_title">
-				History of the <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
+				<?php echo gtext("History");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
 			</div>
 			
 			<div class="notebook_insert_link">
@@ -127,7 +127,7 @@
 
 			<?php if ($showDiff === true) { ?>
 			<div class="notebook_view_title">
-				Differences between the revision of <b><?php echo smartDate($update_new);?></b>, created by <b><?php echo getLinkToUser($u->getUser($updated_by));?></b>, and the revision of <b><?php echo smartDate($update_old);?></b>
+				<?php echo gtext("Differences between the revision of");?> <b><?php echo smartDate($update_new);?></b>, <?php echo gtext("created by");?> <b><?php echo getLinkToUser($u->getUser($updated_by));?></b>, <?php echo gtext("and the revision of");?> <b><?php echo smartDate($update_old);?></b>
 			</div>
 			<?php } ?>
 		
@@ -148,7 +148,7 @@
 		<?php } else if (strcmp($this->action,'revision') === 0) { ?>
 
 			<div class="notebook_view_title">
-				Revision of the <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
+				<?php echo gtext("Revision");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
 			</div>
 			
 			<div class="notebook_insert_link">
@@ -158,7 +158,7 @@
 		<?php } else if (strcmp($this->action,'insert') === 0) { ?>
 
 			<div class="notebook_view_title">
-				Insert a new <?php echo singular($this->controller);?>
+				<?php echo gtext("Insert");?> - <?php echo singular($this->controller);?>
 			</div>
 		
 			<div class="notebook_insert_link">
@@ -168,7 +168,7 @@
 		<?php } else if (strcmp($this->action,'update') === 0) { ?>
 
 			<div class="notebook_view_title">
-				Edit the <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
+				<?php echo gtext("Edit");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
 			</div>
 			
 			<div class="notebook_insert_link">
@@ -178,7 +178,7 @@
 		<?php } else if (strcmp($this->action,'talk') === 0) { ?>
 
 			<div class="notebook_view_title">
-				Talk page of the <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
+				<?php echo gtext("Talk page");?> - <?php echo singular($this->controller).' <b>'.$ne_name.'</b>';?>
 			</div>
 			
 			<div class="notebook_insert_link">
-- 
cgit v1.2.3