From 9cfcb4bb32e2fb8f5dbabd7faa06e47adf1c23af Mon Sep 17 00:00:00 2001
From: Antonio Gallo <tonicucoz@gmail.com>
Date: Sun, 4 Dec 2011 19:07:42 +0000
Subject: improved i18n

---
 h-source/Application/Views/Acquisitioncards/catalogue.php | 14 +++++---------
 h-source/Application/Views/page.php                       |  8 ++++----
 2 files changed, 9 insertions(+), 13 deletions(-)

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

diff --git a/h-source/Application/Views/Acquisitioncards/catalogue.php b/h-source/Application/Views/Acquisitioncards/catalogue.php
index f9d86d7..23ce477 100644
--- a/h-source/Application/Views/Acquisitioncards/catalogue.php
+++ b/h-source/Application/Views/Acquisitioncards/catalogue.php
@@ -25,18 +25,14 @@
 				<?php echo $popup;?>
 			</div>
 			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo betterVendor($this->viewArgs['vendor'])?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['comm_year']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['compatibility']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['interface']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
+				<?php echo $popupLabel;?>
 			</div>
 		</div>
 		
 		<!--if no notebooks found-->
 		<?php if (strcmp($recordNumber,0) === 0) { ?>
 		<div class="viewall_no_items_found">
-			<?php echo gtext("No acquisition card found");?>..
+			<?php echo gtext($notFoundString);?>..
 		</div>
 		<?php } ?>
 		
@@ -62,17 +58,17 @@
 			
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['comm_year'];?></b></div>
+				<div class="inner_value"><b><?php echo gtext($item['hardware']['comm_year']);?></b></div>
 			</div>
 			
 			<div class="notebook_vendor">
 				<div class="inner_label"><?php echo gtext("interface");?>:</div>
-				<div class="inner_value"><b><?php echo $item['hardware']['interface'];?></b></div>
+				<div class="inner_value"><b><?php echo gtext(translate($item['hardware']['interface']));?></b></div>
 			</div>
 			
 			<div class="notebook_kernel">
 				<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-				<div class="inner_value"><b><?php echo $item['hardware']['compatibility'];?></b></div>
+				<div class="inner_value"><b><?php echo gtext($item['hardware'][$worksField]);?></b></div>
 			</div>
 			
 			<div class="notebook_view_link">
diff --git a/h-source/Application/Views/page.php b/h-source/Application/Views/page.php
index e879d0e..0cf4e34 100644
--- a/h-source/Application/Views/page.php
+++ b/h-source/Application/Views/page.php
@@ -97,22 +97,22 @@
 				<?php if (strcmp($this->controller,'videocards') === 0 ) { ?>
 				
 					<div class="inner_label"><?php echo gtext("how does it work with free software?");?></div>
-					<div class="inner_value"><b><?php echo Videocard::$videoReverse[$item[$tableName][$worksField]];?></b></div>
+					<div class="inner_value"><b><?php echo gtext(Videocard::$videoReverse[$item[$tableName][$worksField]]);?></b></div>
 					
 				<?php } else if (strcmp($this->controller,'printers') === 0 ) { ?>
 				
 					<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['compatibility'];?></b> <a class="open_help_window" target="blank" title="compatibility help page" href="<?php echo $this->baseUrl."/help/index/$lang#printer-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
+					<div class="inner_value"><b><?php echo gtext($item[$tableName]['compatibility']);?></b> <a class="open_help_window" target="blank" title="compatibility help page" href="<?php echo $this->baseUrl."/help/index/$lang#printer-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
 					
 				<?php } else if (strcmp($this->controller,'scanners') === 0 ) { ?>
 				
 					<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['compatibility'];?></b> <a class="open_help_window" target="blank" title="compatibility help page" href="<?php echo $this->baseUrl."/help/index/$lang#scanner-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
+					<div class="inner_value"><b><?php echo gtext($item[$tableName]['compatibility']);?></b> <a class="open_help_window" target="blank" title="compatibility help page" href="<?php echo $this->baseUrl."/help/index/$lang#scanner-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
 					
 				<?php } else { ?>
 				
 					<div class="inner_label"><?php echo gtext("does it work with free software?");?></div>
-					<div class="inner_value"><b><?php echo $item[$tableName][$worksField];?></b></div>
+					<div class="inner_value"><b><?php echo gtext($item[$tableName][$worksField]);?></b></div>
 					
 				<?php } ?>
 				
-- 
cgit v1.2.3