jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45734) Handle "invalid group" in user friendly way
......................................................................
(bug 45734) Handle "invalid group" in user friendly way
Change-Id: I24ba035841f0e3f9ab26c91c1bc53a258b35cd54
---
M Translate.i18n.php
M resources/css/ext.translate.special.translate.css
M specials/SpecialTranslate.php
3 files changed, 17 insertions(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 1b4f6d5..963c9df 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -486,6 +486,7 @@
'tux-empty-list-all' => 'This message group is empty',
'tux-empty-list-all-guide' => 'Select a different message group to
translate',
+ 'tux-translate-page-no-such-group' => "'''The indicated group does not
exist.''' Select a different message group.",
'tux-empty-list-translated' => 'No translated messages',
'tux-empty-list-translated-guide' => 'You can help translating',
@@ -1099,6 +1100,7 @@
* {{msg-mw|Translate-messagereview-reviewswithyou}}',
'tux-empty-list-all' => '{{Tuxspec|7}} This is a heading.',
'tux-empty-list-all-guide' => '{{Tuxspec|7}} This is a secondary guide
text.',
+ 'tux-translate-page-no-such-group' => 'An error message that appears
about the group selector on Special:Translate when an invalid group was
requested.',
'tux-empty-list-translated' => '{{Tuxspec|7}} This is a heading.',
'tux-empty-list-translated-guide' => '{{Tuxspec|7}} This is a secondary
guide text.',
'tux-empty-list-translated-action' => '{{Tuxspec|7}} This is a action
button.
diff --git a/resources/css/ext.translate.special.translate.css
b/resources/css/ext.translate.special.translate.css
index 1c43581..9be382c 100644
--- a/resources/css/ext.translate.special.translate.css
+++ b/resources/css/ext.translate.special.translate.css
@@ -118,13 +118,13 @@
margin: 5px 0;
}
-.tux-editor-header .group-warning {
+.group-warning {
background: #FFF5AA;
padding: 5px;
margin: 5px 0;
}
-.tux-editor-header .group-warning:empty {
+.group-warning:empty {
display: none;
}
diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index a8f70f4..2c03a44 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
@@ -70,6 +70,7 @@
$out->addHTML( Html::openElement( 'div', array(
'class' => 'grid ext-translate-container',
) ) );
+
$out->addHTML( $this->tuxSettingsForm( $errors ) );
$out->addHTML( $this->messageSelector() );
} else {
@@ -226,10 +227,12 @@
$this->options['group'] = $this->defaults['group'];
} else {
$languages = $this->group->getTranslatableLanguages();
+
if ( $languages !== null && !isset(
$languages[$this->options['language']] ) ) {
$errors['language'] = $this->msg(
'translate-language-disabled' )->text();
}
}
+
return $errors;
}
@@ -686,6 +689,16 @@
public function groupInformation() {
$output = $this->getOutput();
+ // If we get here in the TUX mode, it means that invalid group
+ // was requested. There is default group for no params case.
+ if ( self::isBeta( $this->getRequest() ) ) {
+ $output->addHtml( Html::rawElement(
+ 'div',
+ array( 'class' => 'twelve columns
group-warning' ),
+ $this->msg( 'tux-translate-page-no-such-group'
)->parse()
+ ) );
+ }
+
$output->addHtml(
Html::openElement( 'div', array(
'class' => 'eight columns
ext-translate-msggroup-selector',
--
To view, visit https://gerrit.wikimedia.org/r/54212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24ba035841f0e3f9ab26c91c1bc53a258b35cd54
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[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
