jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354946 )
Change subject: Add labels to the buttons in the unchanged text parts
......................................................................
Add labels to the buttons in the unchanged text parts
Change-Id: I5083453e5da4609b74d6b931887ffc7f3e7cf8c9
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.TwoColConflict.filterOptions.js
4 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 5d89311..03c33ce 100644
--- a/extension.json
+++ b/extension.json
@@ -73,6 +73,10 @@
"scripts": [
"modules/ext.TwoColConflict.filterOptions.js"
],
+ "messages": [
+ "twoColConflict-label-show-unchanged",
+ "twoColConflict-label-hide-unchanged"
+ ],
"dependencies": [
"ext.TwoColConflict.AutoScroll",
"oojs-ui"
diff --git a/i18n/en.json b/i18n/en.json
index 173c7fb..6aac1bf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -30,6 +30,8 @@
"twoColConflict-label-show": "show",
"twoColConflict-label-hide": "hide",
"twoColConflict-label-unchanged": "unchanged text",
+ "twoColConflict-label-show-unchanged": "show unchanged text",
+ "twoColConflict-label-hide-unchanged": "hide unchanged text",
"twoColConflict-show-help-tooltip": "Show help text",
"twoColConflict-help-dialog-slide1": "This page helps you to resolve an
edit conflict. There are two columns: The first shows the conflicting changes
and the second is a text editor, whose content will be published.\n\nFeedback
is very much appreciated
[//www.mediawiki.org/wiki/Help_talk:Two_Column_Edit_Conflict_View here].",
"twoColConflict-help-dialog-slide2": "The first column shows the
changes in your version and the changes in the currently saved version. The
differences between both versions are highlighted.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3ade329..c755360 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -34,6 +34,8 @@
"twoColConflict-label-show": "Label for the option showing elements in
the diff view.\n{{Identical|Show}}",
"twoColConflict-label-hide": "Label for the option hiding elements in
the diff view.\n{{Identical|Hide}}",
"twoColConflict-label-unchanged": "Label for the options showing and
hiding unchanged text in the diff view.",
+ "twoColConflict-label-show-unchanged": "Label for the buttons in the
diff view to show unchanged text.",
+ "twoColConflict-label-hide-unchanged": "Label for the buttons in the
diff view to hide unchanged text.",
"twoColConflict-show-help-tooltip": "Text shown in a tooltip for the
\"Show help\" button.",
"twoColConflict-help-dialog-slide1": "{{doc-important|The \"editor\"
here refers to the editor softwares/extensions/features such as Wikitext
editor, VisualEditor, ... etc. Not a person who edits pages.}}\nText shown on
the first slide of the help dialog.",
"twoColConflict-help-dialog-slide2": "Text shown on the second slide of
the help dialog.",
diff --git a/modules/ext.TwoColConflict.filterOptions.js
b/modules/ext.TwoColConflict.filterOptions.js
index e2b7437..34dea4a 100644
--- a/modules/ext.TwoColConflict.filterOptions.js
+++ b/modules/ext.TwoColConflict.filterOptions.js
@@ -52,15 +52,19 @@
indicator: 'down',
value: 0,
name: 'mw-twocolconflict-expand-collapse',
- classes: [ 'mw-twocolconflict-expand-collapse-btn' ]
+ classes: [ 'mw-twocolconflict-expand-collapse-btn' ],
+ title: mw.msg( 'twoColConflict-label-show-unchanged' )
} );
+ expandBtn.$element.children().attr( 'aria-label',
expandBtn.getTitle() );
collapseBtn = new OO.ui.ButtonInputWidget( {
indicator: 'up',
value: 1,
name: 'mw-twocolconflict-expand-collapse',
- classes: [ 'mw-twocolconflict-expand-collapse-btn' ]
+ classes: [ 'mw-twocolconflict-expand-collapse-btn' ],
+ title: mw.msg( 'twoColConflict-label-hide-unchanged' )
} );
+ collapseBtn.$element.children().attr( 'aria-label',
collapseBtn.getTitle() );
$( '.mw-twocolconflict-diffchange-same-collapsed' ).prepend(
expandBtn.$element );
$( '.mw-twocolconflict-diffchange-same-full' ).prepend(
collapseBtn.$element );
--
To view, visit https://gerrit.wikimedia.org/r/354946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5083453e5da4609b74d6b931887ffc7f3e7cf8c9
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
