jenkins-bot has submitted this change and it was merged.
Change subject: Fix merge conflict breaking localised bold/italic icons
......................................................................
Fix merge conflict breaking localised bold/italic icons
Bug introduced by change Ic97a636f9.
Bug: 53094
Change-Id: I4bf0bd4d340dfbad26a0d729de866985f81d14aa
(cherry picked from commit c0650459dffda45e7c85cb9e4c57a62adee557a8)
---
M modules/ve/ui/tools/ve.ui.AnnotationTool.js
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/tools/ve.ui.AnnotationTool.js
b/modules/ve/ui/tools/ve.ui.AnnotationTool.js
index ab3d526..a979b5f 100644
--- a/modules/ve/ui/tools/ve.ui.AnnotationTool.js
+++ b/modules/ve/ui/tools/ve.ui.AnnotationTool.js
@@ -79,7 +79,7 @@
ve.ui.BoldAnnotationTool.static.group = 'textStyle';
ve.ui.BoldAnnotationTool.static.icon = {
'default': 'bold-a',
- 'be-tarask': 'bold-cyrl-te-el',
+ 'be': 'bold-cyrl-te',
'cs': 'bold-b',
'da': 'bold-f',
'de': 'bold-f',
@@ -100,7 +100,6 @@
'os': 'bold-cyrl-be',
'pl': 'bold-b',
'pt': 'bold-n',
- 'pt-br': 'bold-n',
'ru': 'bold-cyrl-zhe',
'sv': 'bold-f'
};
@@ -125,7 +124,7 @@
ve.ui.ItalicAnnotationTool.static.group = 'textStyle';
ve.ui.ItalicAnnotationTool.static.icon = {
'default': 'italic-a',
- 'be-tarask': 'italic-cyrl-ka',
+ 'be': 'italic-cyrl-ka',
'cs': 'italic-i',
'da': 'italic-k',
'de': 'italic-k',
@@ -146,7 +145,6 @@
'os': 'italic-cyrl-ka',
'pl': 'italic-i',
'pt': 'italic-i',
- 'pt-br': 'italic-i',
'ru': 'italic-cyrl-ka',
'sv': 'italic-k'
};
--
To view, visit https://gerrit.wikimedia.org/r/84095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bf0bd4d340dfbad26a0d729de866985f81d14aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.22wmf16
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
