Implement the updated version of gallery3-vendor/exifer which has gettext replaced with calls to the gallery t method to provide translation. Fixes ticket 672.

1 files changed, 38 insertions, 38 deletions

diff --git a/modules/exif/lib/makers/nikon.php b/modules/exif/lib/makers/nikon.php
index c7d706db..ebc2af7c 100644
--- a/modules/exif/lib/makers/nikon.php
+++ b/modules/exif/lib/makers/nikon.php
@@ -42,7 +42,7 @@ function lookup_Nikon_tag($tag,$model) {
 			case "0008": $tag = "Focus";break;	
 			case "0009": $tag = "Unknown2";break;	
 			case "000a": $tag = "DigitalZoom";break;	
-			case "000b": $tag = gettext("Converter");break;	
+			case "000b": $tag = (string) t("Converter");break;	
 			
 			default: $tag = "unknown:".$tag;break;
 		}
@@ -113,48 +113,48 @@ function formatNikonData($type,$tag,$intel,$model,$data) {
 		$data=hexdec($data);
 		
 		if($tag=="0003" && $model==0) { //Quality
-			if($data == 1) $data = gettext("VGA Basic");
-			else if($data == 2) $data = gettext("VGA Normal");
-			else if($data == 3) $data = gettext("VGA Fine");
-			else if($data == 4) $data = gettext("SXGA Basic");
-			else if($data == 5) $data = gettext("SXGA Normal");
-			else if($data == 6) $data = gettext("SXGA Fine");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 1) $data = (string) t("VGA Basic");
+			else if($data == 2) $data = (string) t("VGA Normal");
+			else if($data == 3) $data = (string) t("VGA Fine");
+			else if($data == 4) $data = (string) t("SXGA Basic");
+			else if($data == 5) $data = (string) t("SXGA Normal");
+			else if($data == 6) $data = (string) t("SXGA Fine");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 		if($tag=="0004" && $model==0) { //Color
-			if($data == 1) $data = gettext("Color");
-			else if($data == 2) $data = gettext("Monochrome");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 1) $data = (string) t("Color");
+			else if($data == 2) $data = (string) t("Monochrome");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 		if($tag=="0005" && $model==0) { //Image Adjustment
-			if($data == 0) $data = gettext("Normal");
-			else if($data == 1) $data = gettext("Bright+");
-			else if($data == 2) $data = gettext("Bright-");
-			else if($data == 3) $data = gettext("Contrast+");
-			else if($data == 4) $data = gettext("Contrast-");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 0) $data = (string) t("Normal");
+			else if($data == 1) $data = (string) t("Bright+");
+			else if($data == 2) $data = (string) t("Bright-");
+			else if($data == 3) $data = (string) t("Contrast+");
+			else if($data == 4) $data = (string) t("Contrast-");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 		if($tag=="0006" && $model==0) { //CCD Sensitivity
 			if($data == 0) $data = "ISO-80";
 			else if($data == 2) $data = "ISO-160";
 			else if($data == 4) $data = "ISO-320";
 			else if($data == 5) $data = "ISO-100";
-			else $data = gettext("Unknown").": ".$data;
+			else $data = (string) t("Unknown").": ".$data;
 		}
 		if($tag=="0007" && $model==0) { //White Balance
-			if($data == 0) $data = gettext("Auto");
-			else if($data == 1) $data = gettext("Preset");
-			else if($data == 2) $data = gettext("Daylight");
-			else if($data == 3) $data = gettext("Incandescense");
-			else if($data == 4) $data = gettext("Flourescence");
-			else if($data == 5) $data = gettext("Cloudy");
-			else if($data == 6) $data = gettext("SpeedLight");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 0) $data = (string) t("Auto");
+			else if($data == 1) $data = (string) t("Preset");
+			else if($data == 2) $data = (string) t("Daylight");
+			else if($data == 3) $data = (string) t("Incandescense");
+			else if($data == 4) $data = (string) t("Flourescence");
+			else if($data == 5) $data = (string) t("Cloudy");
+			else if($data == 6) $data = (string) t("SpeedLight");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 		if($tag=="000b" && $model==0) { //Converter
-			if($data == 0) $data = gettext("None");
-			else if($data == 1) $data = gettext("Fisheye");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 0) $data = (string) t("None");
+			else if($data == 1) $data = (string) t("Fisheye");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 	} else if($type=="UNDEFINED") {
 		
@@ -162,7 +162,7 @@ function formatNikonData($type,$tag,$intel,$model,$data) {
 			$data=$data/100;
 		}
 		if($tag=="0088" && $model==1) { //AF Focus Position
-			$temp = gettext("Center");
+			$temp = (string) t("Center");
 			$data = bin2hex($data);
 			$data = str_replace("01","Top",$data);
 			$data = str_replace("02","Bottom",$data);
@@ -178,20 +178,20 @@ function formatNikonData($type,$tag,$intel,$model,$data) {
 		
 		if($tag=="0083" && $model==1) { //Lens Type
 				$data = hexdec(substr($data,0,2));
-			if($data == 0) $data = gettext("AF non D");
-			else if($data == 1) $data = gettext("Manual");
+			if($data == 0) $data = (string) t("AF non D");
+			else if($data == 1) $data = (string) t("Manual");
 			else if($data == 2) $data = "AF-D or AF-S";
 			else if($data == 6) $data = "AF-D G";
 			else if($data == 10) $data = "AF-D VR";
-			else $data = gettext("Unknown").": ".$data;
+			else $data = (string) t("Unknown").": ".$data;
 		}
 		if($tag=="0087" && $model==1) { //Flash type
 				$data = hexdec(substr($data,0,2));
-			if($data == 0) $data = gettext("Did Not Fire");
-			else if($data == 4) $data = gettext("Unknown");
-			else if($data == 7) $data = gettext("External");
-			else if($data == 9) $data = gettext("On Camera");
-			else $data = gettext("Unknown").": ".$data;
+			if($data == 0) $data = (string) t("Did Not Fire");
+			else if($data == 4) $data = (string) t("Unknown");
+			else if($data == 7) $data = (string) t("External");
+			else if($data == 9) $data = (string) t("On Camera");
+			else $data = (string) t("Unknown").": ".$data;
 		}
 	}