jenkins-bot has submitted this change and it was merged.

Change subject: Add ULS groups to an aggregate group
......................................................................


Add ULS groups to an aggregate group

Change-Id: I7699fa7e310df2c673081b2258e7c4efb871b8ad
---
M TranslateSettings.php
A groups/MediaWiki/UniversalLanguageSelectorAgg.yaml
M groups/MediaWiki/WikimediaMainAgg.yaml
M groups/MediaWiki/mediawiki-defines.txt
4 files changed, 15 insertions(+), 11 deletions(-)

Approvals:
  Siebrand: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/TranslateSettings.php b/TranslateSettings.php
index 895e467..3d5ba0b 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -174,6 +174,7 @@
 # Disabled by Siebrand / 2011-10-23. Maintainer is not willing to stick to 
conventions.
 #$wgTranslateGroupFiles[] = "$GROUPS/MediaWiki/SocialProfileAgg.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/MediaWiki/TranslateAgg.yaml";
+$wgTranslateGroupFiles[] = 
"$GROUPS/MediaWiki/UniversalLanguageSelectorAgg.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/MediaWiki/VisualEditorAgg.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/MediaWiki/WikimediaMainAgg.yaml";
 $wgTranslateGroupFiles[] = "$GROUPS/MediaWiki/WikimediaAgg.yaml";
diff --git a/groups/MediaWiki/UniversalLanguageSelectorAgg.yaml 
b/groups/MediaWiki/UniversalLanguageSelectorAgg.yaml
new file mode 100644
index 0000000..97a9a15
--- /dev/null
+++ b/groups/MediaWiki/UniversalLanguageSelectorAgg.yaml
@@ -0,0 +1,12 @@
+BASIC:
+  id: ext-universallanguageselector-0-all
+  label: All UniversalLanguageSelector messages
+  icon: wiki://Mediawiki-logo.png
+  meta: yes
+  class: AggregateMessageGroup
+  description: '{{int:translate-group-desc-universallanguageselector}}'
+  namespace: NS_MEDIAWIKI
+
+GROUPS:
+  - ext-universallanguageselector
+  - out-jquery-uls
diff --git a/groups/MediaWiki/WikimediaMainAgg.yaml 
b/groups/MediaWiki/WikimediaMainAgg.yaml
index 80bc94b..5563b09 100644
--- a/groups/MediaWiki/WikimediaMainAgg.yaml
+++ b/groups/MediaWiki/WikimediaMainAgg.yaml
@@ -27,7 +27,6 @@
   - ext-imagemap
   - ext-inputbox
   - ext-intersection
-  - ext-jquery-uls
   - ext-mobilefrontend # r93435
   - ext-newusermessage
   - ext-parserfunctions
@@ -43,7 +42,7 @@
   - ext-timeline
   - ext-titleblacklist
   - ext-torblock
-  - ext-universallanguageselector # change-id: 
b78d96d69d820c13ed262d5558d8c6e0ba5a6b2a
+  - ext-universallanguageselector-0-all
   - ext-uploadwizard
   - ext-visualeditor-0-all
   - ext-wikibase-client # change-id: 5f4c990f3a102f8ae51e4d7bd3f6cf15550a2bf4
diff --git a/groups/MediaWiki/mediawiki-defines.txt 
b/groups/MediaWiki/mediawiki-defines.txt
index c697b01..09eccfe 100644
--- a/groups/MediaWiki/mediawiki-defines.txt
+++ b/groups/MediaWiki/mediawiki-defines.txt
@@ -1783,17 +1783,9 @@
 
 Unicode Converter
 
-Universal Language Selector - MediaWiki
-id = ext-universallanguageselector
-file = UniversalLanguageSelector/UniversalLanguageSelector.i18n.php
-descmsg = uls-desc
-ignored = uls-ime-helppage
-
-Universal Language Selector - jQuery
-id = ext-jquery-uls
+Universal Language Selector
 descmsg = uls-desc
 format = json
-file = UniversalLanguageSelector/i18n/%CODE%.json
 prefix = jquery-uls- | *
 
 UR Names

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7699fa7e310df2c673081b2258e7c4efb871b8ad
Gerrit-PatchSet: 6
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to