[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: When target template not available use UI language for templ...

2016-11-25 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: When target template not available use UI language for template 
card
..


When target template not available use UI language for template card

Use UI language for showing 'Not available in LanguageName'

Change-Id: I90498deda2a81d3884415e0f2aa31dada564af44
---
M modules/tools/ext.cx.tools.template.card.js
M modules/tools/styles/ext.cx.tools.template.card.less
2 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Nikerabbit: Checked; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/tools/ext.cx.tools.template.card.js 
b/modules/tools/ext.cx.tools.template.card.js
index 22c2e1e..937e0d7 100644
--- a/modules/tools/ext.cx.tools.template.card.js
+++ b/modules/tools/ext.cx.tools.template.card.js
@@ -300,13 +300,15 @@
TemplateControlCard.prototype.markUndaptable = function () {
var actions = this.actions;
 
-   // Hide the menu item for 'Use equivalent'
if ( !this.templateTool.targetTemplate.title ) {
+   // Hide the menu item for 'Use equivalent'
actions = this.actions.slice( 1 );
-   this.card.$targetTemplateTitle.text(
-   mw.msg( 'cx-template-not-available', 
$.uls.data.getAutonym( mw.cx.targetLanguage ) )
+   this.card.$targetTemplateTitle.hide().after( $( '' 
)
+   .addClass( 'card__template-target-missing' )
+   .text( mw.msg( 'cx-template-not-available', 
$.uls.data.getAutonym( mw.cx.targetLanguage ) ) )
);
}
+
this.buildActionsMenu( actions );
};
 
diff --git a/modules/tools/styles/ext.cx.tools.template.card.less 
b/modules/tools/styles/ext.cx.tools.template.card.less
index 3bce6a3..33cd8f4 100644
--- a/modules/tools/styles/ext.cx.tools.template.card.less
+++ b/modules/tools/styles/ext.cx.tools.template.card.less
@@ -15,7 +15,9 @@
}
}
 
-   .card__template-source-title {
+   .card__template-source-title,
+   .card__template-target-title,
+   .card__template-target-missing {
.mw-ui-item;
.mw-ui-one-whole;
float: none;
@@ -23,10 +25,6 @@
}
 
.card__template-target-title {
-   .mw-ui-item;
-   .mw-ui-one-whole;
-   float: none;
-   padding: 5px 10px;
font-weight: bold;
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/322857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I90498deda2a81d3884415e0f2aa31dada564af44
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 
Gerrit-Reviewer: Amire80 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Santhosh 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[master]: When target template not available use UI language for templ...

2016-11-22 Thread Santhosh (Code Review) 
Santhosh has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/322857

Change subject: When target template not available use UI language for template 
card
..

When target template not available use UI language for template card

Use UI language for showing 'Not available in LanguageName'

Change-Id: I90498deda2a81d3884415e0f2aa31dada564af44
---
M modules/tools/ext.cx.tools.template.card.js
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation 
refs/changes/57/322857/1

diff --git a/modules/tools/ext.cx.tools.template.card.js 
b/modules/tools/ext.cx.tools.template.card.js
index 22c2e1e..c2a3924 100644
--- a/modules/tools/ext.cx.tools.template.card.js
+++ b/modules/tools/ext.cx.tools.template.card.js
@@ -298,14 +298,20 @@
 * Mark the template as Unadaptable template
 */
TemplateControlCard.prototype.markUndaptable = function () {
-   var actions = this.actions;
+   var uiLanguage, actions = this.actions;
 
// Hide the menu item for 'Use equivalent'
if ( !this.templateTool.targetTemplate.title ) {
+   uiLanguage = mw.config.get( 'wgUserLanguage' );
actions = this.actions.slice( 1 );
-   this.card.$targetTemplateTitle.text(
-   mw.msg( 'cx-template-not-available', 
$.uls.data.getAutonym( mw.cx.targetLanguage ) )
-   );
+   this.card.$targetTemplateTitle
+   .prop( {
+   lang: uiLanguage,
+   dir: $.uls.data.getDir( uiLanguage )
+   } )
+   .text(
+   mw.msg( 'cx-template-not-available', 
$.uls.data.getAutonym( mw.cx.targetLanguage ) )
+   );
}
this.buildActionsMenu( actions );
};

-- 
To view, visit https://gerrit.wikimedia.org/r/322857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90498deda2a81d3884415e0f2aa31dada564af44
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits