[MediaWiki-commits] [Gerrit] Make label and description placeholders language aware - change (mediawiki...Wikibase)
Addshore has submitted this change and it was merged.
Change subject: Make label and description placeholders language aware
..
Make label and description placeholders language aware
Bug: 60027
Change-Id: Icb9b3354d68e8e2332b764abb969d55ba32bb27f
---
M lib/resources/Resources.php
M lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
M lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
M lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableDescription.tests.js
M lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableLabel.tests.js
M repo/Wikibase.i18n.php
6 files changed, 135 insertions(+), 26 deletions(-)
Approvals:
WikidataJenkins: Verified
Addshore: Looks good to me, approved
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 42bbe27..7470712 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -408,7 +408,9 @@
'wikibase-save-inprogress',
'wikibase-remove-inprogress',
'wikibase-label-edit-placeholder',
+
'wikibase-label-edit-placeholder-language-aware',
'wikibase-description-edit-placeholder',
+
'wikibase-description-edit-placeholder-language-aware',
'wikibase-aliases-label',
'wikibase-aliases-input-help-message',
'wikibase-alias-edit-placeholder',
diff --git a/lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
b/lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
index db0fb0b..f770a79 100644
--- a/lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
+++ b/lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
@@ -60,15 +60,28 @@
var ev = wb.ui.PropertyEditTool.EditableValue,
$subject = $( subject ),
$interfaceParent = $subject.children( '.wb-value' ).first(),
- simpleInterface = new ev.Interface( $interfaceParent, {
- 'inputPlaceholder': mw.msg(
'wikibase-description-edit-placeholder' ),
- 'autoExpand': false
- } );
+ languageName, placeHolderMsg, simpleInterface;
options = options || {};
options.valueLanguageContext =
options.valueLanguageContext ||
ev.getValueLanguageContextFromDom( $interfaceParent );
+ languageName = wb.getLanguageNameByCode( options.valueLanguageContext );
+
+ if ( languageName ) {
+ placeHolderMsg = mw.msg(
+ 'wikibase-description-edit-placeholder-language-aware',
+ languageName
+ );
+ } else {
+ placeHolderMsg = mw.msg(
'wikibase-description-edit-placeholder' );
+ }
+
+ simpleInterface = new ev.Interface( $interfaceParent, {
+ 'inputPlaceholder': placeHolderMsg,
+ 'autoExpand': false
+ } );
+
return new SELF( $subject, options, simpleInterface, toolbar );
};
diff --git a/lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
b/lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
index 9184515..341777e 100644
--- a/lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
+++ b/lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
@@ -82,15 +82,28 @@
var ev = wb.ui.PropertyEditTool.EditableValue,
$subject = $( subject ),
$interfaceParent = $subject.find( '.wb-value' ).first(),
- simpleInterface = new ev.Interface( $interfaceParent, {
- 'inputPlaceholder': mw.msg(
'wikibase-label-edit-placeholder' ),
- 'autoExpand': false
- } );
+ languageName, placeHolderMsg, simpleInterface;
options = options || {};
options.valueLanguageContext =
options.valueLanguageContext ||
ev.getValueLanguageContextFromDom( $interfaceParent );
+ languageName = wb.getLanguageNameByCode( options.valueLanguageContext );
+
+ if ( languageName ) {
+ placeHolderMsg = mw.msg(
+ 'wikibase-label-edit-placeholder-language-aware',
+ languageName
+ );
+ } else {
+ placeHolderMsg = mw.msg( 'wikibase-label-edit-placeholder' );
+ }
+
+ simpleInterface = new ev.Interface( $interfaceParent, {
+ 'inputPlaceholder': placeHolderMsg,
+ 'autoExpand': false
+ } );
+
// TODO: get rid of this
simpleInterface.normalize = function( value ) {
value = ev.Interface.prototype.normalize.call( this, value );
diff --git
[MediaWiki-commits] [Gerrit] Make label and description placeholders language aware - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/108471
Change subject: Make label and description placeholders language aware
..
Make label and description placeholders language aware
Bug: 60027
Change-Id: Icb9b3354d68e8e2332b764abb969d55ba32bb27f
---
M lib/resources/Resources.php
M lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
M lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
M repo/Wikibase.i18n.php
4 files changed, 40 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/71/108471/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 42bbe27..7470712 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -408,7 +408,9 @@
'wikibase-save-inprogress',
'wikibase-remove-inprogress',
'wikibase-label-edit-placeholder',
+
'wikibase-label-edit-placeholder-language-aware',
'wikibase-description-edit-placeholder',
+
'wikibase-description-edit-placeholder-language-aware',
'wikibase-aliases-label',
'wikibase-aliases-input-help-message',
'wikibase-alias-edit-placeholder',
diff --git a/lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
b/lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
index db0fb0b..81c1c8c 100644
--- a/lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
+++ b/lib/resources/wikibase.ui.PropertyEditTool.EditableDescription.js
@@ -60,15 +60,28 @@
var ev = wb.ui.PropertyEditTool.EditableValue,
$subject = $( subject ),
$interfaceParent = $subject.children( '.wb-value' ).first(),
- simpleInterface = new ev.Interface( $interfaceParent, {
- 'inputPlaceholder': mw.msg(
'wikibase-description-edit-placeholder' ),
- 'autoExpand': false
- } );
+ languageName, placeHolderMsg, simpleInterface;
options = options || {};
options.valueLanguageContext =
options.valueLanguageContext ||
ev.getValueLanguageContextFromDom( $interfaceParent );
+ languageName = wb.getLanguageNameByCode( options.valueLanguageContext );
+
+ if ( languageName ) {
+ placeHolderMsg = mw.msg(
+ 'wikibase-description-edit-placeholder-language-aware',
+ wb.getLanguageNameByCode( options.valueLanguageContext )
+ );
+ } else {
+ placeHolderMsg = mw.msg(
'wikibase-description-edit-placeholder' );
+ }
+
+ simpleInterface = new ev.Interface( $interfaceParent, {
+ 'inputPlaceholder': placeHolderMsg,
+ 'autoExpand': false
+ } );
+
return new SELF( $subject, options, simpleInterface, toolbar );
};
diff --git a/lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
b/lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
index 9184515..c8b9433 100644
--- a/lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
+++ b/lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js
@@ -82,15 +82,28 @@
var ev = wb.ui.PropertyEditTool.EditableValue,
$subject = $( subject ),
$interfaceParent = $subject.find( '.wb-value' ).first(),
- simpleInterface = new ev.Interface( $interfaceParent, {
- 'inputPlaceholder': mw.msg(
'wikibase-label-edit-placeholder' ),
- 'autoExpand': false
- } );
+ languageName, placeHolderMsg, simpleInterface;
options = options || {};
options.valueLanguageContext =
options.valueLanguageContext ||
ev.getValueLanguageContextFromDom( $interfaceParent );
+ languageName = wb.getLanguageNameByCode( options.valueLanguageContext );
+
+ if ( languageName ) {
+ placeHolderMsg = mw.msg(
+ 'wikibase-label-edit-placeholder-language-aware',
+ wb.getLanguageNameByCode( options.valueLanguageContext )
+ );
+ } else {
+ placeHolderMsg = mw.msg( 'wikibase-label-edit-placeholder' );
+ }
+
+ simpleInterface = new ev.Interface( $interfaceParent, {
+ 'inputPlaceholder': placeHolderMsg,
+ 'autoExpand': false
+ } );
+
// TODO: get rid of this
simpleInterface.normalize = function( value ) {
value = ev.Interface.prototype.normalize.call( this, value );
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index
