improved i18n

3 files changed, 22 insertions, 22 deletions

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 @@
 				<?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['compatibility']?></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['subtype']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['sort-by']?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo gtext(betterVendor($this->viewArgs['vendor']));?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['compatibility'])?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['comm_year'])?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['subtype'])?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['sort-by'])?></div>
 			</div>
 		</div>
 
@@ -38,8 +38,8 @@
 				<?php echo $popupMore;?>
 			</div>
 			<div class="viewall_popup_menu_status">
-				<div class="viewall_popup_menu_status_item"><?php echo $this->viewArgs['bios']?></div>
-				<div class="viewall_popup_menu_status_item"><?php echo Hardware::translate($this->viewArgs['architecture']);?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo gtext($this->viewArgs['bios'])?></div>
+				<div class="viewall_popup_menu_status_item"><?php echo gtext(translate($this->viewArgs['architecture']));?></div>
 			</div>
 		</div>
 		
@@ -65,17 +65,17 @@
 			
 			<div class="notebook_vendor">
 					<div class="inner_label"><?php echo gtext("subtype (notebook, netbook, tablet)");?></div>
-					<div class="inner_value"><b><?php echo $item['hardware']['subtype'];?></b></div>
+					<div class="inner_value"><b><?php echo gtext($item['hardware']['subtype']);?></b></div>
 				</div>
 				
 			<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_compatibility">
 				<div class="inner_label"><?php echo gtext("compatibility with free software");?>:</div>
-				<div class="inner_value"><?php echo $item['hardware']['compatibility'];?></div>
+				<div class="inner_value"><?php echo gtext($item['hardware']['compatibility']);?></div>
 			</div>
 			
 			<div class="notebook_view_link">
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 @@
 				
 				<div class="notebook_vendor">
 					<div class="inner_label"><?php echo gtext("subtype (notebook, netbook, tablet)");?>:</div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['subtype'];?></b></div>
+					<div class="inner_value"><b><?php echo gtext($item[$tableName]['subtype']);?></b></div>
 				</div>
 
 				<div class="notebook_vendor">
 					<div class="inner_label"><?php echo gtext("architecture");?>:</div>
-					<div class="inner_value"><b><?php echo Hardware::translate($item[$tableName]['architecture']);?></b></div>
+					<div class="inner_value"><b><?php echo gtext(translate($item[$tableName]['architecture']));?></b></div>
 				</div>
 				
 				<div class="notebook_vendor">
 					<div class="inner_label"><?php echo gtext("does it have a free BIOS?");?></div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['bios'];?></b></div>
+					<div class="inner_value"><b><?php echo gtext($item[$tableName]['bios']);?></b></div>
 				</div>
 
 				<div class="notebook_vendor">
 					<div class="inner_label"><?php echo gtext("can free operating systems be installed?");?></div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['can_free_systems_be_installed'];?></b></div>
+					<div class="inner_value"><b><?php echo gtext($item[$tableName]['can_free_systems_be_installed']);?></b></div>
 				</div>
 				
 				<div class="notebook_vendor">
 					<div class="inner_label"><?php echo gtext("year of commercialization");?>:</div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['comm_year'];?></b></div>
+					<div class="inner_value"><b><?php echo gtext($item[$tableName]['comm_year']);?></b></div>
 				</div>
 
 				<div class="notebook_compatibility">
 					<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#notebook-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#notebook-compatibility";?>"><img class="top_left_images_help" src="<?php echo $this->baseUrl;?>/Public/Img/Acun/help_hint.png"></a></div>
 				</div>
 				
 				<div class="model_tested_on">
@@ -91,17 +91,17 @@
 				
 				<div class="notebook_kernel">
 					<div class="inner_label"><?php echo gtext("video card model");?>:</div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['video_card_type'];?></b> (<?php echo Notebooks::$videoReverse[$item[$tableName]['video_card_works']];?>)</div>
+					<div class="inner_value"><b><?php echo $item[$tableName]['video_card_type'];?></b> (<?php echo gtext(Notebooks::$videoReverse[$item[$tableName]['video_card_works']]);?>)</div>
 				</div>
 				
 				<div class="notebook_kernel">
 					<div class="inner_label"><?php echo gtext("wifi model");?>:</div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['wifi_type'];?></b> (<?php echo Notebooks::$wifiReverse[$item[$tableName]['wifi_works']];?>)</div>
+					<div class="inner_value"><b><?php echo $item[$tableName]['wifi_type'];?></b> (<?php echo gtext(Notebooks::$wifiReverse[$item[$tableName]['wifi_works']]);?>)</div>
 				</div>
 				
 				<div class="notebook_kernel">
 					<div class="inner_label"><?php echo gtext("webcam model");?>:</div>
-					<div class="inner_value"><b><?php echo $item[$tableName]['webcam_type'];?></b> (<?php echo Notebooks::$webcamReverse[$item[$tableName]['webcam_works']];?>)</div>
+					<div class="inner_value"><b><?php echo $item[$tableName]['webcam_type'];?></b> (<?php echo gtext(Notebooks::$webcamReverse[$item[$tableName]['webcam_works']]);?>)</div>
 				</div>
 				
 				<div class="notebook_description">
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 @@
 
 				<?php if ($this->viewArgs['history_page'] === 1) { ?>
 				<?php foreach ($rev1 as $rev) { ?>
-				<li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['hardware']['update_date']);?> by <?php echo $u->getLinkToUserFromId($rev['hardware']['updated_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li>
+				<li class="page_history_current_item"><b><?php echo gtext("Current revision");?>:</b> <?php echo smartDate($rev['hardware']['update_date']);?> <?php echo gtext('by');?> <?php echo $u->getLinkToUserFromId($rev['hardware']['updated_by']);?> (<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/0".$this->viewStatus;?>">diff</a>)</li>
 				<?php } ?>
 				<?php } ?>
 				
 				<?php foreach ($rev2 as $rev) { ?>
 				<li class="page_history_item">
 				
-					<a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['revisions']['update_date']);?></a> by <?php echo $u->getLinkToUserFromId($rev['revisions']['updated_by']);?>
+					<a href="<?php echo $this->baseUrl."/".$this->controller."/revision/$lang/".$rev['revisions']['id_rev'].$this->viewStatus;?>"><?php echo smartDate($rev['revisions']['update_date']);?></a> <?php echo gtext('by');?> <?php echo $u->getLinkToUserFromId($rev['revisions']['updated_by']);?>
 				
 					<?php if (strcmp($rev['revisions']['id_rev'],$firstRev) !== 0) {?>
 					(<a href="<?php echo $this->baseUrl."/".$this->controller."/differences/$lang/$id/".$rev['revisions']['id_rev'].$this->viewStatus;?>">diff</a>)
 					<?php } ?>
 					
 					<?php if ($islogged === 'yes') { ?>
-					(<a href="<?php echo $this->baseUrl.'/'.$this->controller.'/climb/'.$lang.'/'.$rev['revisions']['id_rev'].'/'.$token.$this->viewStatus;?>">make current</a>)
+					(<a href="<?php echo $this->baseUrl.'/'.$this->controller.'/climb/'.$lang.'/'.$rev['revisions']['id_rev'].'/'.$token.$this->viewStatus;?>"><?php echo gtext('Make current');?></a>)
 					<?php } ?>
 				
 				</li>