http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69031

Revision: 69031
Author:   siebrand
Date:     2010-07-04 23:01:28 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
* merge Potlatch.yml into OpenStreetMap.yml
* add out-osm as aggregate of out-osm-potlatch and out-osm-site
* group OpenStreetMap groups op Special:Translate

Modified Paths:
--------------
    trunk/extensions/Translate/Translate.php
    trunk/extensions/Translate/groups/OpenStreetMap/OpenStreetMap.yml

Removed Paths:
-------------
    trunk/extensions/Translate/groups/OpenStreetMap/Potlatch.yml

Modified: trunk/extensions/Translate/Translate.php
===================================================================
--- trunk/extensions/Translate/Translate.php    2010-07-04 22:57:42 UTC (rev 
69030)
+++ trunk/extensions/Translate/Translate.php    2010-07-04 23:01:28 UTC (rev 
69031)
@@ -256,6 +256,7 @@
        '/^wikia/' => array( 'wikia' ),
        '/^out-mantis/' => array( 'mantis' ),
        '/^out-okawix/' => array( 'okawix' ),
+       '/^out-osm/' => array( 'osm' ),
        '/^out-shapado/' => array( 'shapado' ),
 //     '/^page\|/' => array( 'page' ),
 );

Modified: trunk/extensions/Translate/groups/OpenStreetMap/OpenStreetMap.yml
===================================================================
--- trunk/extensions/Translate/groups/OpenStreetMap/OpenStreetMap.yml   
2010-07-04 22:57:42 UTC (rev 69030)
+++ trunk/extensions/Translate/groups/OpenStreetMap/OpenStreetMap.yml   
2010-07-04 23:01:28 UTC (rev 69031)
@@ -1,23 +1,40 @@
+TEMPLATE:
+  BASIC:
+  namespace: NS_OSM
+  class: FileBasedMessageGroup
+
+  FILES:
+    class: YamlFFS
+    codeAsRoot: 1
+    codeMap:
+    be-tarask: be-TARASK
+    pt-br: pt-BR
+    sr-ec: sr-EC
+    zh-cn: zh-CN
+    zh-tw: zh-TW
+
 ---
 BASIC:
+  id: out-osm-0-all
+  label: All OpenStreetMap messages
+  description: "{{int:bw-desc-openstreetmap}}"
+  display: out/osm
+  meta: yes
+  class: AggregateMessageGroup
+GROUPS:
+  - out-osm-potlatch
+  - out-osm-site
+
+---
+BASIC:
   id: out-osm-site
   label: OpenStreetMap - Website
   description: "{{int:bw-desc-osm-site}}"
-  namespace: NS_OSM
   display: out/osm/site
-  class: FileBasedMessageGroup
 
 FILES:
-  class: RubyYamlFFS
   sourcePattern: %GROUPROOT%/osm/config/locales/%CODE%.yml
-  codeAsRoot: 1
   targetPattern: osm/config/locales/%CODE%.yml
-  codeMap:
-    be-tarask: be-TARASK
-    pt-br: pt-BR
-    sr-ec: sr-EC
-    zh-cn: zh-CN
-    zh-tw: zh-TW
 
 CHECKER:
   class: RubyMessageChecker
@@ -72,3 +89,29 @@
     - site.edit.anon_edits_link
     - site.index.license.license_url
     - site.index.license.project_url
+
+---
+BASIC:
+  id: out-osm-potlatch
+  label: OpenStreetMap - Potlatch
+  description: "{{int:bw-desc-osm-potlatch}}"
+  display: out/osm/potlatch
+
+FILES:
+  sourcePattern: %GROUPROOT%/osm/config/potlatch/locales/%CODE%.yml
+  targetPattern: osm/config/potlatch/locales/%CODE%.yml
+
+TAGS:
+  optional:
+    - help_html
+    - inspector_way
+    - inspector_way_name
+    - microblog_name_identica
+    - microblog_name_twitter
+    - option_layer_digitalglobe_haiti
+    - option_layer_geoeye_gravitystorm_haiti
+    - option_layer_geoeye_haiti
+    - option_layer_geoeye_nypl_haiti
+    - option_layer_mapnik
+    - option_layer_osmarender
+    - option_layer_yahoo

Deleted: trunk/extensions/Translate/groups/OpenStreetMap/Potlatch.yml
===================================================================
--- trunk/extensions/Translate/groups/OpenStreetMap/Potlatch.yml        
2010-07-04 22:57:42 UTC (rev 69030)
+++ trunk/extensions/Translate/groups/OpenStreetMap/Potlatch.yml        
2010-07-04 23:01:28 UTC (rev 69031)
@@ -1,36 +0,0 @@
----
-BASIC:
-  id: out-osm-potlatch
-  label: OpenStreetMap - Potlatch
-  description: "{{int:bw-desc-osm-potlatch}}"
-  namespace: NS_OSM
-  display: out/osm/potlatch
-  class: FileBasedMessageGroup
-
-FILES:
-  class: YamlFFS
-  sourcePattern: %GROUPROOT%/osm/config/potlatch/locales/%CODE%.yml
-  codeAsRoot: 1
-  targetPattern: osm/config/potlatch/locales/%CODE%.yml
-  codeMap:
-    be-tarask: be-TARASK
-    pt-br: pt-BR
-    sr-ec: sr-EC
-    zh-cn: zh-CN
-    zh-tw: zh-TW
-    zh-hant: zh-HANT
-
-TAGS:
-  optional:
-    - help_html
-    - inspector_way
-    - inspector_way_name
-    - microblog_name_identica
-    - microblog_name_twitter
-    - option_layer_digitalglobe_haiti
-    - option_layer_geoeye_gravitystorm_haiti
-    - option_layer_geoeye_haiti
-    - option_layer_geoeye_nypl_haiti
-    - option_layer_mapnik
-    - option_layer_osmarender
-    - option_layer_yahoo



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to