jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 45552) Add Unproofread filter for the Proofread view
......................................................................
(Bug 45552) Add Unproofread filter for the Proofread view
* Add an 'Unproofread' filter in proofread mode alone.
* Hide this filter in translate mode.
* If there is no other filter 'Unproofread' is the filter for
proofread
* Filter applied for this translate|!reviewer:#|!last-translator:#
# is userId of current user.
Change-Id: Ida34f6f56f668fb1fe75146523e7a9c6f17d394c
---
M Translate.i18n.php
M resources/js/ext.translate.messagetable.js
M specials/SpecialTranslate.php
3 files changed, 24 insertions(+), 4 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.i18n.php b/Translate.i18n.php
index e226359..7e98f4f 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -434,6 +434,7 @@
'tux-tab-untranslated' => 'Untranslated',
'tux-tab-outdated' => 'Outdated',
'tux-tab-translated' => 'Translated',
+ 'tux-tab-unproofread' => 'Unproofread',
'tux-edit' => 'Edit',
'tux-status-optional' => 'Optional',
@@ -926,6 +927,8 @@
{{Identical|Outdated}}',
'tux-tab-translated' => 'Tab in [[Special:Translate]] new ui to select
which messages to show.
{{Identical|Translated}}',
+ 'tux-tab-unproofread' => 'Tab in [[Special:Translate]] new ui to select
which messages to show.
+{{Identical|Proofread}}',
'tux-edit' => 'Link in [[Special:Translate]] to open message editor',
'tux-status-optional' => 'Status label in [[Special:Translate]]
indicating that message should only be translated in special cases.
{{Identical|Optional}}',
@@ -19091,6 +19094,7 @@
'tux-tab-untranslated' => 'പരിഭാഷപ്പെടുത്താത്തവ',
'tux-tab-outdated' => 'കാലഹരണപ്പെട്ടവ',
'tux-tab-translated' => 'പരിഭാഷപ്പെടുത്തിയവ',
+ 'tux-tab-unproofread' => 'സംശോധനം ചെയ്യാത്തവ',
'tux-edit' => 'പരിഭാഷപ്പെടുത്തുക',
'tux-status-optional' => 'ഐച്ഛികം',
'tux-status-fuzzy' => 'കാലഹരണപ്പെട്ടവ',
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 813aff7..a15d07a 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -499,7 +499,9 @@
switchMode: function ( mode ) {
var messageTable = this,
filter = messageTable.$loader.data( 'filter' ),
+ userId = mw.config.get( 'wgUserId' ),
$tuxTabUntranslated,
+ $tuxTabUnproofread,
$controlOwnButton,
$hideTranslatedButton;
@@ -520,28 +522,40 @@
messageTable.$container.empty();
$tuxTabUntranslated = $( '.tux-message-selector >
.tux-tab-untranslated' );
+ $tuxTabUnproofread = $( '.tux-message-selector >
.tux-tab-unproofread' );
$controlOwnButton = messageTable.$actionBar.find(
'.tux-proofread-own-translations-button' );
$hideTranslatedButton = messageTable.$actionBar.find(
'.tux-editor-clear-translated' );
if ( messageTable.mode === 'proofread' ||
messageTable.mode === 'page' ) {
- $( '.tux-message-selector >
.tux-tab-untranslated' ).addClass( 'hide' );
+ $tuxTabUntranslated.addClass( 'hide' );
+ $tuxTabUnproofread.removeClass( 'hide' );
// Fix the filter if it is untranslated.
Untranslated does not make sense
// for proofread mode. Keep the filter if it is
not 'untranslated'
- if ( filter.indexOf( '!translated' ) >= 0 ) {
+ if ( !filter || filter.indexOf( '!translated' )
>= 0 ) {
messageTable.messages = [];
- mw.translate.changeFilter( 'translated'
);
- $( '.tux-message-selector >
.tux-tab-translated' ).addClass( 'selected' );
+ // default filter for proofread mode
+ mw.translate.changeFilter(
'translated|!reviewer:' + userId
+ + '|!last-translator:' + userId
);
+ $tuxTabUnproofread.addClass( 'selected'
);
}
$tuxTabUntranslated.addClass( 'hide' );
$controlOwnButton.removeClass( 'hide' );
$hideTranslatedButton.addClass( 'hide' );
} else {
$tuxTabUntranslated.removeClass( 'hide' );
+ $tuxTabUnproofread.addClass( 'hide' );
$controlOwnButton.addClass( 'hide' );
if ( messageTable.$loader.data( 'filter'
).indexOf( '!translated' ) > -1 ) {
$hideTranslatedButton.removeClass(
'hide' );
}
+
+ if ( filter && filter.indexOf(
'!last-translator' ) >= 0 ) {
+ messageTable.messages = [];
+ // default filter for translate mode
+ mw.translate.changeFilter(
'!translated' );
+ $tuxTabUntranslated.addClass(
'selected' );
+ }
}
$.each( messageTable.messages, function ( index,
message ) {
diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index 853d7c9..5ce5c64 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
@@ -383,12 +383,14 @@
$output = Html::openElement( 'div', array( 'class' => 'row
tux-messagetable-header' ) );
$output .= Html::openElement( 'div', array( 'class' => 'nine
columns' ) );
$output .= Html::openElement( 'ul', array( 'class' => 'row
tux-message-selector' ) );
+ $userId = $this->getUser()->getId();
$tabs = array(
'tux-tab-all' => '',
'tux-tab-untranslated' => '!translated',
//'Hardest',
'tux-tab-outdated' => 'fuzzy',
'tux-tab-translated' => 'translated',
+ 'tux-tab-unproofread' =>
"translated|!reviewer:$userId|!last-translator:$userId",
);
$params = $this->nondefaults;
--
To view, visit https://gerrit.wikimedia.org/r/53350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida34f6f56f668fb1fe75146523e7a9c6f17d394c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
Gerrit-Reviewer: Nikerabbit <[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
