Fix for Ticket #1045

Also contains fix for Ticket #850 Tuk language inclusion. Git cherry pick revision 118bfde from the 2.6 branch ( Turkish language files Small improvements) Git cherry pick revision 151cbea from the 2.6 branch (Integrated Turkish language and fixes) commit 151cbea included "Added rest-api for GeoServer-Bridge interaction" - these changes were removed from the cherry picked. Incorporated the following changes as well. Renamed all occurrences of the tu to tur Removed print-config.yaml as I did not see how this was related. Added some missing loc files Added tur to the data load process. Added rewrite for tur Also added ita as it was missing. Also resolved a lot of conflicts.
geonetwork · Sep 21, 2012 · 9b8c8be · 9b8c8be
1 parent cf75fbe
commit 9b8c8be
Show file tree

Hide file tree

Showing 77 changed files with 4,911 additions and 27 deletions.
diff --git a/web/pom.xml b/web/pom.xml
@@ -522,6 +522,7 @@
 				<include>${geonetwork.build.dir}/scripts/map/lang/no.js</include>
 				<include>${geonetwork.build.dir}/scripts/map/lang/fi.js</include>
 				<include>${geonetwork.build.dir}/scripts/map/lang/it.js</include>
+				<include>${geonetwork.build.dir}/scripts/map/lang/tr.js</include>
 
                 <include>${geonetwork.build.dir}/scripts/map/Ext.ux/form/DateTime.js</include>
 

diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/loc-tur-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/loc-tur-default.sql
diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v270/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v270/migrate-default.sql
@@ -119,6 +119,7 @@ INSERT INTO Languages VALUES ('por','Português', 'por','y', 'n');
 INSERT INTO Languages VALUES ('rus','русский язык', 'rus','n', 'n');
 INSERT INTO Languages VALUES ('spa','Español', 'spa','y', 'n');
 INSERT INTO Languages VALUES ('vie','Tiếng Việt', 'vie','n', 'n');
+INSERT INTO Languages VALUES ('tur','Turkish', 'tur','n', 'n');
 
 UPDATE CategoriesDes SET langid='ara' WHERE langid='ar';
 UPDATE CategoriesDes SET langid='cat' WHERE langid='ca';
@@ -129,10 +130,11 @@ UPDATE CategoriesDes SET langid='fin' WHERE langid='fi';
 UPDATE CategoriesDes SET langid='fre' WHERE langid='fr';
 UPDATE CategoriesDes SET langid='ger' WHERE langid='de';
 UPDATE CategoriesDes SET langid='nor' WHERE langid='no';
-UPDATE CategoriesDes SET langid='por' WHERE langid='pt';
+UPDATE CategoriesDes SET langid='por' WHERE langid='po';
 UPDATE CategoriesDes SET langid='rus' WHERE langid='ru';
-UPDATE CategoriesDes SET langid='spa' WHERE langid='es';
+UPDATE CategoriesDes SET langid='spa' WHERE langid='sp';
 UPDATE CategoriesDes SET langid='vie' WHERE langid='vi';
+UPDATE CategoriesDes SET langid='tur' WHERE langid='tr';
 
 UPDATE IsoLanguagesDes SET langid='ara' WHERE langid='ar';
 UPDATE IsoLanguagesDes SET langid='cat' WHERE langid='ca';
@@ -147,6 +149,7 @@ UPDATE IsoLanguagesDes SET langid='por' WHERE langid='pt';
 UPDATE IsoLanguagesDes SET langid='rus' WHERE langid='ru';
 UPDATE IsoLanguagesDes SET langid='spa' WHERE langid='es';
 UPDATE IsoLanguagesDes SET langid='vie' WHERE langid='vi';
+UPDATE IsoLanguagesDes SET langid='tur' WHERE langid='tr';
 
 UPDATE RegionsDes SET langid='ara' WHERE langid='ar';
 UPDATE RegionsDes SET langid='cat' WHERE langid='ca';
@@ -161,6 +164,7 @@ UPDATE RegionsDes SET langid='por' WHERE langid='pt';
 UPDATE RegionsDes SET langid='rus' WHERE langid='ru';
 UPDATE RegionsDes SET langid='spa' WHERE langid='es';
 UPDATE RegionsDes SET langid='vie' WHERE langid='vi';
+UPDATE RegionsDes SET langid='tur' WHERE langid='tr';
 
 
 UPDATE GroupsDes SET langid='ara' WHERE langid='ar';
@@ -176,6 +180,7 @@ UPDATE GroupsDes SET langid='por' WHERE langid='pt';
 UPDATE GroupsDes SET langid='rus' WHERE langid='ru';
 UPDATE GroupsDes SET langid='spa' WHERE langid='es';
 UPDATE GroupsDes SET langid='vie' WHERE langid='vi';
+UPDATE GroupsDes SET langid='tur' WHERE langid='tr';
 
 
 UPDATE OperationsDes SET langid='ara' WHERE langid='ar';
@@ -191,6 +196,7 @@ UPDATE OperationsDes SET langid='por' WHERE langid='pt';
 UPDATE OperationsDes SET langid='rus' WHERE langid='ru';
 UPDATE OperationsDes SET langid='spa' WHERE langid='es';
 UPDATE OperationsDes SET langid='vie' WHERE langid='vi';
+UPDATE OperationsDes SET langid='tur' WHERE langid='tr';
 
 
 UPDATE StatusValuesDes SET langid='ara' WHERE langid='ar';
@@ -206,6 +212,7 @@ UPDATE StatusValuesDes SET langid='por' WHERE langid='pt';
 UPDATE StatusValuesDes SET langid='rus' WHERE langid='ru';
 UPDATE StatusValuesDes SET langid='spa' WHERE langid='es';
 UPDATE StatusValuesDes SET langid='vie' WHERE langid='vi';
+UPDATE StatusValuesDes SET langid='tur' WHERE langid='tr';
 
 
 UPDATE CswServerCapabilitiesInfo SET langid='ara' WHERE langid='ar';
@@ -221,6 +228,7 @@ UPDATE CswServerCapabilitiesInfo SET langid='por' WHERE langid='pt';
 UPDATE CswServerCapabilitiesInfo SET langid='rus' WHERE langid='ru';
 UPDATE CswServerCapabilitiesInfo SET langid='spa' WHERE langid='es';
 UPDATE CswServerCapabilitiesInfo SET langid='vie' WHERE langid='vi';
+UPDATE CswServerCapabilitiesInfo SET langid='tur' WHERE langid='tr';
 
 
 DELETE FROM Languages WHERE id='ar';
@@ -233,6 +241,7 @@ DELETE FROM Languages WHERE id='nl';
 DELETE FROM Languages WHERE id='no';
 DELETE FROM Languages WHERE id='pt';
 DELETE FROM Languages WHERE id='ru';
+DELETE FROM Languages WHERE id='tr';
 
 ALTER TABLE Languages DROP COLUMN isocode;
 
@@ -251,6 +260,7 @@ UPDATE IsoLanguages SET shortcode='pt' WHERE code='por';
 UPDATE IsoLanguages SET shortcode='ru' WHERE code='rus';
 UPDATE IsoLanguages SET shortcode='es' WHERE code='spa';
 UPDATE IsoLanguages SET shortcode='vi' WHERE code='vie';
+UPDATE IsoLanguages SET shortcode='tr' WHERE code='tur';
 
 
 UPDATE Settings SET value='2.7.0' WHERE name='version';

diff --git a/web/src/main/webapp/WEB-INF/config-db.xml b/web/src/main/webapp/WEB-INF/config-db.xml
@@ -31,9 +31,8 @@
     <file path="WEB-INF/classes/setup/sql/data" filePrefix="loc-fin-"/>
     <file path="WEB-INF/classes/setup/sql/data" filePrefix="loc-ara-"/><!-- Draft to be improved-->
     <file path="WEB-INF/classes/setup/sql/data" filePrefix="loc-ita-"/><!-- Draft to be improved-->
+    <file path="WEB-INF/classes/setup/sql/data" filePrefix="loc-tur-"/><!-- Draft to be improved-->
     <!--<file path="WEB-INF/classes/setup/sql/data" filePrefix="loc-vie-"/> Draft to be improved-->
-    <!-- ca missing from 2.6.x -->
-    <!-- tr missing from 2.6.x -->
   </data>
   <migrate>
     <version id="243">

diff --git a/web/src/main/webapp/WEB-INF/config-gui.xml b/web/src/main/webapp/WEB-INF/config-gui.xml
@@ -42,6 +42,7 @@
      <por/>
      <rus/>
      <spa/>
+     <tur/>
  </languages>
 
 

diff --git a/web/src/main/webapp/WEB-INF/config-test.xml b/web/src/main/webapp/WEB-INF/config-test.xml
@@ -25,6 +25,8 @@
 					localized="false" />
 				<xml name="strings.por" file="loc/por/xml/strings.xml"
 					localized="false" />
+				<xml name="strings.tur" file="loc/tur/xml/strings.xml"
+					localized="false" />
 				<xml name="strings.cat" file="loc/cat/xml/strings.xml"
 					localized="false" />
                 <xml name="strings.fin" file="loc/fin/xml/strings.xml"
@@ -52,6 +54,8 @@
 					localized="false" />
 				<xml name="about.por" file="loc/por/xml/about.xml"
 					localized="false" />
+				<xml name="about.tur" file="loc/tur/xml/about.xml"
+					localized="false" />					
 				<xml name="about.cat" file="loc/cat/xml/about.xml"
 					localized="false" />
                 <xml name="about.fin" file="loc/fin/xml/about.xml"
@@ -79,6 +83,8 @@
 					localized="false" />
 				<xml name="config.por" file="loc/por/xml/config.xml"
 					localized="false" />
+				<xml name="config.tur" file="loc/tur/xml/config.xml"
+					localized="false" />					
 				<xml name="config.cat" file="loc/cat/xml/config.xml"
 					localized="false" />
                 <xml name="config.fin" file="loc/fin/xml/config.xml"
@@ -105,13 +111,15 @@
 				<xml name="harvesting.dut"
 					file="loc/dut/xml/harvesting.xml" localized="false" />
 				<xml name="harvesting.por"
-					file="loc/por/xml/harvesting.xml" localized="false" />	
+					file="loc/por/xml/harvesting.xml" localized="false" />
 				<xml name="harvesting.cat"
 					file="loc/cat/xml/harvesting.xml" localized="false" />
                 <xml name="harvesting.fin"
                      file="loc/fin/xml/harvesting.xml" localized="false" />
                 <xml name="harvesting.nor"
                      file="loc/nor/xml/harvesting.xml" localized="false" />
+				<xml name="harvesting.tur"
+					file="loc/tur/xml/harvesting.xml" localized="false" />
                 <!-- TODO : add other loc files -->
 			</output>
 		</service>
@@ -141,6 +149,8 @@
 					localized="false" />
 				<xml name="strings.por" file="loc/por/xml/strings.xml"
 					localized="false" />	
+				<xml name="strings.tur" file="loc/tur/xml/strings.xml"
+					localized="false" />					
 				<xml name="strings.cat" file="loc/cat/xml/strings.xml"
 					localized="false" />
                 <xml name="strings.fin" file="loc/fin/xml/strings.xml"
@@ -168,6 +178,8 @@
 					localized="false" />
 				<xml name="about.por" file="loc/por/xml/about.xml"
 					localized="false" />
+				<xml name="about.tur" file="loc/tur/xml/about.xml"
+					localized="false" />					
 				<xml name="about.cat" file="loc/cat/xml/about.xml"
 					localized="false" />
                 <xml name="about.fin" file="loc/fin/xml/about.xml"
@@ -195,6 +207,8 @@
 					localized="false" />
 				<xml name="config.por" file="loc/por/xml/config.xml"
 					localized="false" />
+				<xml name="config.tur" file="loc/tur/xml/config.xml"
+					localized="false" />					
 				<xml name="config.cat" file="loc/cat/xml/config.xml"
 					localized="false" />
                 <xml name="config.fin" file="loc/fin/xml/config.xml"
@@ -228,11 +242,13 @@
                      file="loc/fin/xml/harvesting.xml" localized="false" />
                 <xml name="harvesting.nor"
                      file="loc/nor/xml/harvesting.xml" localized="false" />
+				<xml name="harvesting.tur"
+					file="loc/tur/xml/harvesting.xml" localized="false" />
                 <!-- TODO : add other loc files -->
 			</output>
 		</service>
 		<service name="test.csw">
 			<output sheet="test-csw.xsl"/>							
 		</service>
 	</services>
-</geonet>
+</geonet>
diff --git a/web/src/main/webapp/WEB-INF/urlrewrite.xml b/web/src/main/webapp/WEB-INF/urlrewrite.xml
@@ -66,6 +66,14 @@
         <from>^(.*)/en/(.*)$</from>
         <to type="permanent-redirect" last="true">%{context-path}$1/eng/$2</to>
     </rule>
+    <rule>
+        <from>^(.*)/tr/(.*)$</from>
+        <to type="permanent-redirect" last="true">%{context-path}$1/tur/$2</to>
+    </rule>
+    <rule>
+        <from>^(.*)/it/(.*)$</from>
+        <to type="permanent-redirect" last="true">%{context-path}$1/ita/$2</to>
+    </rule>
 
     <!-- Rules for RESTful urls for metadata retrieve -->
     <rule>

diff --git a/web/src/main/webapp/loc/ara/xml/strings.xml b/web/src/main/webapp/loc/ara/xml/strings.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <strings>
 	<ara>عربي</ara> <!-- Do not translate! -->
-    <cat>Català</cat> <!-- Do not translate! -->
+	<cat>Català</cat> <!-- Do not translate! -->
 	<chi>中文</chi> <!-- Do not translate! -->
-    <dut>Nederlands</dut> <!-- Do not translate -->
-    <eng>English</eng> <!-- Do not translate! -->
-    <fin>Suomeksi</fin>  <!-- Do not translate! -->
-    <fre>Français</fre> <!-- Do not translate! -->
+	<dut>Nederlands</dut> <!-- Do not translate -->
+	<eng>English</eng> <!-- Do not translate! -->
+	<fin>Suomeksi</fin>  <!-- Do not translate! -->
+	<fre>Français</fre> <!-- Do not translate! -->
 	<ger>Deutsch</ger> <!-- Do not translate! -->
 	<ita>Italiano</ita> <!-- Do not translate! -->
-    <nor>Norsk</nor>  <!-- Do not translate! -->
-    <por>Рortuguês</por> <!-- Do not translate! -->
-    <rus>Русский</rus> <!-- Do not translate! -->
+	<nor>Norsk</nor>  <!-- Do not translate! -->
+	<por>Рortuguês</por> <!-- Do not translate! -->
+	<rus>Русский</rus> <!-- Do not translate! -->
 	<spa>Español</spa> <!-- Do not translate! -->
+	<tur>Türkçe</tur> <!-- Do not translate! -->
 
     <anyLanguage>أي لغة</anyLanguage>
 	<nodata>Null</nodata>

diff --git a/web/src/main/webapp/loc/cat/xml/strings.xml b/web/src/main/webapp/loc/cat/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>Qualsevol llenguatge</anyLanguage>
 	<nodata>Null</nodata>
 	<extractRegisterItems>Extract Register Items</extractRegisterItems>

diff --git a/web/src/main/webapp/loc/chi/xml/strings.xml b/web/src/main/webapp/loc/chi/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>任何语言</anyLanguage>
 	<nodata>Null</nodata>
 

diff --git a/web/src/main/webapp/loc/dut/xml/strings.xml b/web/src/main/webapp/loc/dut/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>Ongeacht welke taal</anyLanguage>
 	<nodata>Null</nodata>
 	<!-- new strings - 2.7 -->

diff --git a/web/src/main/webapp/loc/eng/xml/strings.xml b/web/src/main/webapp/loc/eng/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>Any language</anyLanguage>
 	<nodata>Null</nodata>
 	<extractRegisterItems>Extract Register Items</extractRegisterItems>
@@ -787,7 +788,7 @@
   <visualizationService>Visualization service URL (WMS)</visualizationService>
 	<resultsCoordinate>Results matching the coordinate search </resultsCoordinate>
 	<resultsFreeText>Results matching the Free Text Word </resultsFreeText>
-	<resultsMatching>Aggregate Results matching search criteria :</resultsMatching>
+	<resultsMatching>Aggregated results matching search criteria :</resultsMatching>
 	<Reviewer>Content reviewer</Reviewer>
 	<rss>Open RSS feed</rss>
 	<rtitle>Title</rtitle>

diff --git a/web/src/main/webapp/loc/fin/xml/strings.xml b/web/src/main/webapp/loc/fin/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>mikä tahansa kieli</anyLanguage>
 	<nodata>Null</nodata>
 	<extractRegisterItems>Extract Register Items</extractRegisterItems>

diff --git a/web/src/main/webapp/loc/fre/xml/strings.xml b/web/src/main/webapp/loc/fre/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>n'importe quelle langue</anyLanguage>
 	<nodata>Vide</nodata>
 	<!-- new strings - 2.7 -->

diff --git a/web/src/main/webapp/loc/ger/xml/strings.xml b/web/src/main/webapp/loc/ger/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>jede Sprache</anyLanguage>
 	<nodata>Null</nodata>
   <!-- new strings - 2.7 -->

diff --git a/web/src/main/webapp/loc/ita/xml/strings.xml b/web/src/main/webapp/loc/ita/xml/strings.xml
@@ -13,7 +13,8 @@
 	<por>Рortuguês</por> <!-- Do not translate! -->
 	<rus>Русский</rus> <!-- Do not translate! -->
 	<spa>Español</spa> <!-- Do not translate! -->
-
+	<tur>Türkçe</tur> <!-- Do not translate! -->
+
 	<anyLanguage>Qualsiasi lingua</anyLanguage>
 	<nodata>Null</nodata>
 	<extractRegisterItems>Extract Register Items</extractRegisterItems>

diff --git a/web/src/main/webapp/loc/nor/xml/strings.xml b/web/src/main/webapp/loc/nor/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>alle språk</anyLanguage>
 	<nodata>Null</nodata>
 	<extractRegisterItems>Extract Register Items</extractRegisterItems>

diff --git a/web/src/main/webapp/loc/por/xml/strings.xml b/web/src/main/webapp/loc/por/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
     <anyLanguage>Qualquer língua</anyLanguage>
 	<nodata>Null</nodata>
 	<extractRegisterItems>Extract Register Items</extractRegisterItems>

diff --git a/web/src/main/webapp/loc/rus/xml/strings.xml b/web/src/main/webapp/loc/rus/xml/strings.xml
@@ -13,7 +13,8 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
+
 	<!-- new strings - 2.7 -->
 	<nodata>Null</nodata>
 	<extractRegisterItems>Extract Register Items</extractRegisterItems>

diff --git a/web/src/main/webapp/loc/spa/xml/strings.xml b/web/src/main/webapp/loc/spa/xml/strings.xml
@@ -13,7 +13,7 @@
     <por>Рortuguês</por> <!-- Do not translate! -->
     <rus>Русский</rus> <!-- Do not translate! -->
     <spa>Español</spa> <!-- Do not translate! -->
-
+    <tur>Türkçe</tur> <!-- Do not translate! -->
 	<!-- new strings - 2.7 -->
 	<nodata>Null</nodata>
 	<extractRegisterItems>Extract Register Items</extractRegisterItems>

diff --git a/web/src/main/webapp/loc/tur/images/nopreview.gif b/web/src/main/webapp/loc/tur/images/nopreview.gif