From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Mon, 30 May 2005 19:54:54 +0000 (+0000)
Subject: * Using the same message for GPSLatitudeRef and GPSDestLatitudeRef;
X-Git-Tag: 1.5.0alpha2~30
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=2c4ec5c770aae009f9e5a93d2e988cf49d9cb431;p=lhc%2Fweb%2Fwiklou.git

* Using the same message for GPSLatitudeRef and GPSDestLatitudeRef;
  GPSLongitudeRef and GPSDestLongitudeRef; GPSSpeedRef and
  GPSDestDistanceRef; GPSTrackRef,GPSImgDirectionRef and GPSDestBearingRef
---

diff --git a/includes/Exif.php b/includes/Exif.php
index 1d9c13e146..b384f83d69 100644
--- a/includes/Exif.php
+++ b/includes/Exif.php
@@ -631,17 +631,19 @@ class Exif {
 			}
 			
 		case 'GPSLatitudeRef':
+		case 'GPSDestLatitudeRef':
 			switch( $val ) {
 			case 'N': case 'S':
-				return $this->msg( $tag, $val );
+				return $this->msg( 'GPSLatitude', $val );
 			default:
 				return $val;
 			}
 			
 		case 'GPSLongitudeRef':
+		case 'GPSDestLongitudeRef':
 			switch( $val ) {
 			case 'E': case 'W':
-				return $this->msg( $tag, $val );
+				return $this->msg( 'GPSLongitude', $val );
 			default:
 				return $val;
 			}
@@ -663,49 +665,20 @@ class Exif {
 			}
 			
 		case 'GPSSpeedRef':
+		case 'GPSDestDistanceRef':
 			switch( $val ) {
 			case 'K': case 'M': case 'N':
-				return $this->msg( $tag, $val );
+				return $this->msg( 'GPSSpeed', $val );
 			default:
 				return $val;
 			}
 			
 		case 'GPSTrackRef':
-			switch( $val ) {
-			case 'T': case 'M':
-				return $this->msg( $tag, $val );
-			default:
-				return $val;
-			}
-			
 		case 'GPSImgDirectionRef':
-			switch( $val ) {
-			case 'T': case 'M':
-				return $this->msg( $tag, $val );
-			default:
-				return $val;
-			}
-			
-		case 'GPSDestLatitudeRef':
-			switch( $val ) {
-			case 'N': case 'S':
-				return $this->msg( $tag, $val );
-			default:
-				return $val;
-			}
-			
-		case 'GPSDestLongitudeRef':
-			switch( $val ) {
-			case 'E': case 'W':
-				return $this->msg( $tag, $val );
-			default:
-				return $val;
-			}
-			
 		case 'GPSDestBearingRef':
 			switch( $val ) {
 			case 'T': case 'M':
-				return $this->msg( $tag, $val );
+				return $this->msg( 'GPSDirection', $val );
 			default:
 				return $val;
 			}
diff --git a/languages/Language.php b/languages/Language.php
index b4f3f29910..cd5cfd373d 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2061,11 +2061,13 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
 'exif-subjectdistancerange-2' => 'Close view',
 'exif-subjectdistancerange-3' => 'Distant view',
 
-'exif-gpslatituderef-n' => 'North latitude',
-'exif-gpslatituderef-s' => 'South latitude',
+// Pseudotags used for GPSLatitudeRef and GPSDestLatitudeRef
+'exif-gpslatitude-n' => 'North latitude',
+'exif-gpslatitude-s' => 'South latitude',
 
-'exif-gpslongituderef-e' => 'East longitude',
-'exif-gpslongituderef-w' => 'West longitude',
+// Pseudotags used for GPSLongitudeRef and GPSDestLongitudeRef
+'exif-gpslongitude-e' => 'East longitude',
+'exif-gpslongitude-w' => 'West longitude',
 
 'exif-gpsstatus-a' => 'Measurement in progress',
 'exif-gpsstatus-v' => 'Measurement interoperability',
@@ -2073,28 +2075,14 @@ ta[\'ca-nstab-category\'] = new Array(\'c\',\'View the category page\');
 'exif-gpsmeasuremode-2' => '2-dimensional measurement',
 'exif-gpsmeasuremode-3' => '3-dimensional measurement',
 
-'exif-gpsspeedref-k' => 'Kilometres per hour',
-'exif-gpsspeedref-m' => 'Miles per hour',
-'exif-gpsspeedref-n' => 'Knots',
+// Pseudotags used for GPSSpeedRef and GPSDestDistanceRef
+'exif-gpsspeed-k' => 'Kilometres per hour',
+'exif-gpsspeed-m' => 'Miles per hour',
+'exif-gpsspeed-n' => 'Knots',
 
-'exif-gpstrackref-t' => 'True direction',
-'exif-gpstrackref-m' => 'Magnetic direction',
-
-'exif-gpsimgdirectionref-t' => 'True direction',
-'exif-gpsimgdirectionref-m' => 'Magnetic direction',
-
-'exif-gpsdestlatituderef-n' => 'North latitude',
-'exif-gpsdestlatituderef-s' => 'South latitude',
-
-'exif-gpsdestlongituderef-e' => 'East longitude',
-'exif-gpsdestlongituderef-w' => 'West longitude',
-
-'exif-gpsdestbearingref-t' => 'True direction',
-'exif-gpsdestbearingref-m' => 'Magnetic direction',
-
-'exif-gpsdestdistanceref-k' => 'Kilometres per hour',
-'exif-gpsdestdistanceref-m' => 'Miles per hour',
-'exif-gpsdestdistanceref-n' => 'Knots',
+// Pseudotags used for GPSTrackRef, GPSImgDirectionRef and GPSDestBearingRef
+'exif-gpsdirection-t' => 'True direction',
+'exif-gpsdirection-m' => 'Magnetic direction',
 
 # external editor support
 'edit-externally' => 'Edit this file using an external application',