Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/102816


Change subject: Use mediawiki-defines.txt for JSON files
......................................................................

Use mediawiki-defines.txt for JSON files

Change-Id: I69ea55d0b14a4c3659e64b2a3e8981d51243571e
---
M TranslateSettings.php
D groups/MediaWiki/jquery.i18n.yaml
M groups/MediaWiki/mediawiki-defines.txt
3 files changed, 38 insertions(+), 100 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/16/102816/1

diff --git a/TranslateSettings.php b/TranslateSettings.php
index 92d02ff..7a7900a 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -302,7 +302,6 @@
 
 # Namespace 8
 $wgTranslateMessageNamespaces[] = NS_MEDIAWIKI;
-$wgTranslateGroupFiles[] = "$GROUPS/MediaWiki/jquery.i18n.yaml";
 
 # No longer in use.
 wfAddNamespace( 1200, 'Voctrain' );
diff --git a/groups/MediaWiki/jquery.i18n.yaml 
b/groups/MediaWiki/jquery.i18n.yaml
deleted file mode 100644
index c0178f5..0000000
--- a/groups/MediaWiki/jquery.i18n.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-TEMPLATE:
-  BASIC:
-    icon: wiki://Mediawiki-logo.png
-    namespace: NS_MEDIAWIKI
-    class: FileBasedMessageGroup
-
-  FILES:
-    class: JsonFFS
-
----
-BASIC:
-  id: ext-jquery-uls
-  label: jQuery - Universal Language Selector
-  description: "jQuery i18n messages for Universal Language Selector"
-
-MANGLER:
-  class: StringMatcher
-  prefix: jquery-uls-
-  patterns:
-    - "*"
-
-FILES:
-  sourcePattern: 
%GROUPROOT%/mediawiki-extensions/extensions/UniversalLanguageSelector/i18n/%CODE%.json
-  targetPattern: 
mediawiki-extensions/extensions/UniversalLanguageSelector/i18n/%CODE%.json
-
----
-BASIC:
-  id: ext-visualeditor-oojs-ui
-  label: OOjs UI (via VisualEditor)
-  description: "Messages for VisualEditor"
-
-FILES:
-  sourcePattern: 
%GROUPROOT%/mediawiki-extensions/extensions/VisualEditor/modules/oojs-ui/i18n/%CODE%.json
-  targetPattern: 
mediawiki-extensions/extensions/VisualEditor/modules/oojs-ui/i18n/%CODE%.json
----
-BASIC:
-  id: ext-visualeditor-ve
-  label: VisualEditor Core
-  description: "Messages for VisualEditor"
-
-FILES:
-  sourcePattern: 
%GROUPROOT%/mediawiki-extensions/extensions/VisualEditor/modules/ve/i18n/%CODE%.json
-  targetPattern: 
mediawiki-extensions/extensions/VisualEditor/modules/ve/i18n/%CODE%.json
-
-TAGS:
-  optional:
-    - visualeditor-specialcharinspector-characterlist-insert
-
----
-BASIC:
-  id: ext-visualeditor-ve-mw
-  label: VisualEditor (MediaWiki extension)
-  description: "Messages for VisualEditor"
-
-FILES:
-  sourcePattern: 
%GROUPROOT%/mediawiki-extensions/extensions/VisualEditor/modules/ve-mw/i18n/%CODE%.json
-  targetPattern: 
mediawiki-extensions/extensions/VisualEditor/modules/ve-mw/i18n/%CODE%.json
-
-TAGS:
-  optional:
-    - visualeditor-preference-core-discussion-link
-    - visualeditor-preference-core-info-link
-    - visualeditor-preference-language-discussion-link
-    - visualeditor-preference-language-info-link
-    - visualeditor-preference-mwalienextension-discussion-link
-    - visualeditor-preference-mwalienextension-info-link
-    - visualeditor-preference-mwhiero-discussion-link
-    - visualeditor-preference-mwhiero-info-link
-    - visualeditor-preference-mwmath-discussion-link
-    - visualeditor-preference-mwmath-info-link
-  ignored:
-    - accesskey-ca-ve-edit
-    - accesskey-ca-editsource
-
----
-BASIC:
-  id: ext-visualeditor-ve-wmf
-  label: VisualEditor (WMF)
-  description: "Messages for VisualEditor"
-
-FILES:
-  sourcePattern: 
%GROUPROOT%/mediawiki-extensions/extensions/VisualEditor/modules/ve-wmf/i18n/%CODE%.json
-  targetPattern: 
mediawiki-extensions/extensions/VisualEditor/modules/ve-wmf/i18n/%CODE%.json
-
-TAGS:
-  optional:
-    - visualeditor-help-link
diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index 7d6bc0f..4040277 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1699,9 +1699,17 @@
 
 Unicode Converter
 
-Universal Language Selector
+Universal Language Selector - MediaWiki
+id = ext-universallanguageselector
 descmsg = uls-desc
 ignored = uls-ime-helppage
+
+Universal Language Selector - jQuery
+id = ext-jquery-uls
+descmsg = uls-desc
+format = json
+file = UniversalLanguageSelector/i18n/%CODE%.json
+prefix = jquery-uls- | *
 
 UR Names
 
@@ -1735,17 +1743,35 @@
 Vips Scaler
 aliasfile = VipsScaler/VipsScaler.alias.php
 
-# SM: Temporarily moved to jquery.i18n.yaml
-#Visual Editor
-#ignored = accesskey-ca-ve-edit, accesskey-ca-editsource
-#optional = visualeditor-report-link
-#optional = visualeditor-preference-core-discussion-link, 
visualeditor-preference-core-info-link
-#optional = visualeditor-preference-language-discussion-link, 
visualeditor-preference-language-info-link
-#optional = visualeditor-preference-mwalienextension-discussion-link, 
visualeditor-preference-mwalienextension-info-link
-#optional = visualeditor-preference-mwhiero-discussion-link, 
visualeditor-preference-mwhiero-info-link
-#optional = visualeditor-preference-mwmath-discussion-link, 
visualeditor-preference-mwmath-info-link
-#optional = visualeditor-specialcharinspector-characterlist-insert
-#ignored = visualeditor-help-link
+OOjs UI (via VisualEditor)
+id = ext-visualeditor-oojs-ui
+desc-msg = visualeditor-desc
+format = json
+file = VisualEditor/modules/oojs-ui/i18n/%CODE%.json
+
+VisualEditor Core
+id = ext-visualeditor-ve
+desc-msg = visualeditor-desc
+format = json
+file = VisualEditor/modules/ve/i18n/%CODE%.json
+optional = visualeditor-specialcharinspector-characterlist-insert
+
+VisualEditor (MediaWiki extension)
+id = ext-visualeditor-ve-mw
+desc-msg = visualeditor-desc
+format = json
+file = VisualEditor/modules/ve-mw/i18n/%CODE%.json
+optional = visualeditor-preference-core-discussion-link, 
visualeditor-preference-core-info-link, 
visualeditor-preference-language-discussion-link, 
visualeditor-preference-language-info-link
+optional = visualeditor-preference-mwalienextension-discussion-link, 
visualeditor-preference-mwalienextension-info-link, 
visualeditor-preference-mwhiero-discussion-link, 
visualeditor-preference-mwhiero-info-link
+optional = visualeditor-preference-mwmath-discussion-link, 
visualeditor-preference-mwmath-info-link
+ignored = accesskey-ca-ve-edit, accesskey-ca-editsource
+
+VisualEditor (WMF)
+id = ext-visualeditor-ve-wmf
+desc-msg = visualeditor-desc
+format = json
+file = VisualEditor/modules/ve-wmf/i18n/%CODE%.json
+optional = visualeditor-help-link
 
 Vote NY
 file = VoteNY/Vote.i18n.php

-- 
To view, visit https://gerrit.wikimedia.org/r/102816
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69ea55d0b14a4c3659e64b2a3e8981d51243571e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>

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

Reply via email to