jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45553) Indicate that users cannot proofread their own
translations
......................................................................
(bug 45553) Indicate that users cannot proofread their own translations
With styling help from Pau.
Change-Id: I2980447fd62bc9d8eb28fb42dfd0cf29e944bcd0
---
M Translate.i18n.php
M Translate.php
M resources/css/ext.translate.proofread.css
A resources/images/user-small.png
A resources/images/user-small.svg
M resources/js/ext.translate.proofread.js
M resources/js/ext.translate.special.translate.js
7 files changed, 39 insertions(+), 20 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.i18n.php b/Translate.i18n.php
index e226359..05916d3 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -482,6 +482,7 @@
'tux-message-filter-result' => 'Found $1 {{PLURAL:$1|result|results}}
for "$2"',
'tux-message-filter-advanced-button' => 'Advanced search',
'tux-message-filter-optional-messages-label' => 'Optional messages',
+ 'tux-proofread-translated-by-self' => 'Translated by you',
'tux-empty-list-all' => 'This message group is empty',
'tux-empty-list-all-guide' => 'Select a different message group to
translate',
@@ -1011,6 +1012,7 @@
'tux-message-filter-advanced-button' => 'Button label for searching the
messages using [[Special:SearchTranslations]].
{{Identical|Advanced search}}',
'tux-message-filter-optional-messages-label' => 'A label for a
checkbox. Checking the box causes message editor to show optional messages.',
+ 'tux-proofread-translated-by-self' => 'A small notification that
appears in a proofreading box, saying that that message was translated by the
current user.',
'tux-empty-list-all' => '{{Tuxspec|7}} This is a heading.',
'tux-empty-list-all-guide' => '{{Tuxspec|7}} This is a secondary guide
text.',
'tux-empty-list-translated' => '{{Tuxspec|7}} This is a heading.',
@@ -12077,6 +12079,7 @@
'tux-message-filter-result' => 'Found $1 {{PLURAL:$1|נמצאה תוצאה
אחת|נמצאו $1 תוצאות}} עבור "$2"',
'tux-message-filter-advanced-button' => 'חיפוש מתקדם',
'tux-message-filter-optional-messages-label' => 'הודעות אופציונליות',
+ 'tux-proofread-translated-by-self' => 'זה תרגום שלך',
'tux-empty-list-all' => 'קבוצת ההודעות הזאת ריקה',
'tux-empty-list-all-guide' => 'נא לבחור קבוצת הודעות אחרת לתרגום',
'tux-empty-list-translated' => 'אין הודעות מתורגמות',
diff --git a/Translate.php b/Translate.php
index 08ab5ef..73ba992 100644
--- a/Translate.php
+++ b/Translate.php
@@ -292,6 +292,7 @@
'tux-editor-outdated-warning-diff-link',
'tux-proofread-action-tooltip',
'tux-proofread-edit-tooltip',
+ 'tux-proofread-translated-by-self',
'tux-editor-close-tooltip',
'tux-editor-expand-tooltip',
'tux-editor-collapse-tooltip',
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index aede8aa..823d546 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -54,6 +54,18 @@
right: -5px;
}
+.translated-by-self {
+ text-align: right;
+ font-size: x-small;
+ margin-right: 5px;
+ padding-top: 18px; /* Icon height + 3px */
+ /* @embed */
+ background: url(../images/user-small.png) top right no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/user-small.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/user-small.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/user-small.svg);
+}
+
.tux-proofread-status {
top: -10px;
}
diff --git a/resources/images/user-small.png b/resources/images/user-small.png
new file mode 100644
index 0000000..880b035
--- /dev/null
+++ b/resources/images/user-small.png
Binary files differ
diff --git a/resources/images/user-small.svg b/resources/images/user-small.svg
new file mode 100644
index 0000000..082d047
--- /dev/null
+++ b/resources/images/user-small.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" width="15px"
height="15px" viewBox="0 0 15 15" enable-background="new 0 0 15 15"
xml:space="preserve">
+<g>
+ <path fill="#D1D3D4"
d="M12.281,4.776c0,2.639-2.142,4.783-4.78,4.783c-2.64,0-4.779-2.144-4.779-4.783
C2.722,2.138,4.861,0,7.501,0C10.14,0,12.281,2.138,12.281,4.776z"/>
+ <path fill="#D1D3D4"
d="M13.36,8.609h-0.947c-1.031,1.625-2.844,2.707-4.912,2.707c-2.068,0-3.883-1.082-4.914-2.707H1.645
c-0.445,0-0.799,0.358-0.799,0.801v4.795C0.846,14.641,1.199,15,1.645,15H13.36c0.44,0,0.794-0.359,0.794-0.795V9.41
C14.154,8.968,13.801,8.609,13.36,8.609z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/resources/js/ext.translate.proofread.js
b/resources/js/ext.translate.proofread.js
index 92a304c..a8459a6 100644
--- a/resources/js/ext.translate.proofread.js
+++ b/resources/js/ext.translate.proofread.js
@@ -107,11 +107,6 @@
var proofread = this;
this.render();
- // No self review
- if ( this.message.properties['last-translator-text']
=== mw.user.id() ) {
- this.hide();
- }
-
// No review before translating.
if ( !this.message.translation ) {
this.hide();
@@ -139,7 +134,8 @@
render: function () {
var targetLanguage, targetLanguageDir, sourceLanguage,
sourceLanguageDir,
- $proofreadAction, $proofreadEdit;
+ $proofreadAction, $proofreadEdit,
+ translatedBySelf = (
this.message.properties['last-translator-text'] === mw.user.getName() );
sourceLanguage = this.$container.data( 'sourcelangcode'
);
sourceLanguageDir = $.uls.data.getDir( sourceLanguage );
@@ -175,6 +171,11 @@
$( '<div>' )
.addClass( 'tux-proofread-action-block
one column' )
.append(
+ translatedBySelf ?
+ $( '<div>' )
+ .addClass(
'translated-by-self' )
+ .text( mw.msg(
'tux-proofread-translated-by-self' ) ) :
+ $( [] ),
$proofreadAction,
this.message.properties.reviewers ?
$( '<div>' )
@@ -187,6 +188,12 @@
)
.addClass( this.message.properties.status );
+ if ( translatedBySelf ) {
+ this.$message.addClass( 'own-translation' );
+ // Own translations cannot be reviewed, so hide
the review button
+ this.hide();
+ }
+
$proofreadAction.tipsy( {
gravity: 's'
} );
diff --git a/resources/js/ext.translate.special.translate.js
b/resources/js/ext.translate.special.translate.js
index 22c7c02..dd1259a 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -215,19 +215,6 @@
.filter( '.translated, .proofread' );
}
- function getOwnTranslatedMessages( $translateContainer ) {
- $translateContainer = $translateContainer || $(
'.ext-translate-container' );
-
- return $translateContainer.find( '.tux-message-proofread' )
- .filter( function () {
- var $this = $( this );
-
- return ( $this.hasClass( 'translated' ) &&
- $this.data( 'message'
).properties['last-translator-text'] === mw.user.getName()
- );
- } );
- }
-
function workflowSelectionHandler ( state ) {
var $status = $( '.tux-workflow-status' );
@@ -371,7 +358,7 @@
$controlOwnButton = $translateContainer.find(
'.tux-proofread-own-translations-button' );
$controlOwnButton.click( function () {
var $this = $( this ),
- ownTranslatedMessages =
getOwnTranslatedMessages( $translateContainer ),
+ ownTranslatedMessages =
$translateContainer.find( '.own-translation' ),
hideMessage = mw.msg(
'tux-editor-proofreading-hide-own-translations' ),
showMessage = mw.msg(
'tux-editor-proofreading-show-own-translations' );
--
To view, visit https://gerrit.wikimedia.org/r/53135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2980447fd62bc9d8eb28fb42dfd0cf29e944bcd0
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Pginer <[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
