[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Add placeholder text for comma fields
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383772 )
Change subject: Add placeholder text for comma fields
..
Add placeholder text for comma fields
https://phabricator.wikimedia.org/T173563
Change-Id: Id393b25d6d61846e1f37d4b05148c3dd5c7b2a3b
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/ext.advancedSearch.init.js
4 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Pablo Grass (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 20e70cd..491cfb9 100644
--- a/extension.json
+++ b/extension.json
@@ -57,6 +57,7 @@
"advancedSearch-namespaces-articles",
"advancedSearch-namespaces-preset-all",
"advancedSearch-namespaces-search-in",
+ "advancedSearch-placeholder-commas",
"advancedsearch-field-plain",
"advancedsearch-field-phrase",
"advancedsearch-field-or",
diff --git a/i18n/en.json b/i18n/en.json
index 9528bdf..9106ea2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -35,6 +35,8 @@
"advancedsearch-help-filew": "Description: These
fields allow you to specify the width of the file. Be aware of the
following: this is only applicable to file types that have width and
height, like videos and images. Help
page:[https://www.mediawiki.org/wiki/Help:CirrusSearch#File_measures
Filemeasures] Syntax-Equivalent in the normal search:numbers
with filew before them like filew:>800",
"advancedsearch-help-fileh": "Description: These
fields allow you to specify the hieght of the file. Be aware of the
following: this is only applicable to file types that have width and
height, like videos and images. Help
page:[https://www.mediawiki.org/wiki/Help:CirrusSearch#File_measures
Filemeasures] Syntax-Equivalent in the normal search:numbers
with fileh before them like fileh:>600",
+ "advancedSearch-placeholder-commas": "Type words separated by comma
e.g. cats, kittens, ...",
+
"advancedsearch-filetype-section-types": "General file type",
"advancedsearch-filetype-section-image": "Image format",
"advancedsearch-filetype-section-video": "Video format",
@@ -53,9 +55,11 @@
"advancedSearch-filesize-greater-than-symbol": ">",
"advancedSearch-filesize-smaller-than": "lower than",
"advancedSearch-filesize-smaller-than-symbol": "<",
+
"advancedSearch-namespaces-articles": "Articles",
"advancedSearch-namespaces-search-in": "Search in:",
"advancedSearch-namespaces-preset-all": "All",
+
"advancedSearch-beta-feature-message": "Advanced Search Interface",
"advancedSearch-beta-feature-description": "Easy access to advanced
search capabilities on [[Special:Search]]."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a25c837..fa8b844 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -34,6 +34,7 @@
"advancedsearch-help-filetype": "Help text shown in a dialog for the
field for file type",
"advancedsearch-help-filew": "Help text shown in a dialog for the field
for file width in pixels",
"advancedsearch-help-fileh": "Help text shown in a dialog for the field
for file height in pixels",
+ "advancedSearch-placeholder-commas": "Placeholder text shown in fields
that accept multiple values separated by commas",
"advancedsearch-filetype-section-types": "Label for the file type
section",
"advancedsearch-filetype-section-image": "Label for the image format
section",
"advancedsearch-filetype-section-video": "Label for the video format
section",
diff --git a/modules/ext.advancedSearch.init.js
b/modules/ext.advancedSearch.init.js
index bee57d8..077d6e6 100644
--- a/modules/ext.advancedSearch.init.js
+++ b/modules/ext.advancedSearch.init.js
@@ -154,7 +154,10 @@
init: function () {
return new
mw.libs.advancedSearch.ui.ArbitraryWordInput(
state,
- { optionId: 'phrase' }
+ {
+ optionId: 'phrase',
+ placeholder: mw.msg(
'advancedSearch-placeholder-commas' )
+ }
);
}
},
@@ -177,7 +180,10 @@
init: function () {
return new
mw.libs.advancedSearch.ui.ArbitraryWordInput(
state,
- { optionId: 'or' }
+ {
+
[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Add placeholder text for comma fields
Jeroen De Dauw has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383772 )
Change subject: Add placeholder text for comma fields
..
Add placeholder text for comma fields
https://phabricator.wikimedia.org/T173563
Change-Id: Id393b25d6d61846e1f37d4b05148c3dd5c7b2a3b
---
M i18n/en.json
M i18n/qqq.json
M modules/ext.advancedSearch.init.js
3 files changed, 13 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch
refs/changes/72/383772/1
diff --git a/i18n/en.json b/i18n/en.json
index 9528bdf..9106ea2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -35,6 +35,8 @@
"advancedsearch-help-filew": "Description: These
fields allow you to specify the width of the file. Be aware of the
following: this is only applicable to file types that have width and
height, like videos and images. Help
page:[https://www.mediawiki.org/wiki/Help:CirrusSearch#File_measures
Filemeasures] Syntax-Equivalent in the normal search:numbers
with filew before them like filew:>800",
"advancedsearch-help-fileh": "Description: These
fields allow you to specify the hieght of the file. Be aware of the
following: this is only applicable to file types that have width and
height, like videos and images. Help
page:[https://www.mediawiki.org/wiki/Help:CirrusSearch#File_measures
Filemeasures] Syntax-Equivalent in the normal search:numbers
with fileh before them like fileh:>600",
+ "advancedSearch-placeholder-commas": "Type words separated by comma
e.g. cats, kittens, ...",
+
"advancedsearch-filetype-section-types": "General file type",
"advancedsearch-filetype-section-image": "Image format",
"advancedsearch-filetype-section-video": "Video format",
@@ -53,9 +55,11 @@
"advancedSearch-filesize-greater-than-symbol": ">",
"advancedSearch-filesize-smaller-than": "lower than",
"advancedSearch-filesize-smaller-than-symbol": "<",
+
"advancedSearch-namespaces-articles": "Articles",
"advancedSearch-namespaces-search-in": "Search in:",
"advancedSearch-namespaces-preset-all": "All",
+
"advancedSearch-beta-feature-message": "Advanced Search Interface",
"advancedSearch-beta-feature-description": "Easy access to advanced
search capabilities on [[Special:Search]]."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a25c837..fa8b844 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -34,6 +34,7 @@
"advancedsearch-help-filetype": "Help text shown in a dialog for the
field for file type",
"advancedsearch-help-filew": "Help text shown in a dialog for the field
for file width in pixels",
"advancedsearch-help-fileh": "Help text shown in a dialog for the field
for file height in pixels",
+ "advancedSearch-placeholder-commas": "Placeholder text shown in fields
that accept multiple values separated by commas",
"advancedsearch-filetype-section-types": "Label for the file type
section",
"advancedsearch-filetype-section-image": "Label for the image format
section",
"advancedsearch-filetype-section-video": "Label for the video format
section",
diff --git a/modules/ext.advancedSearch.init.js
b/modules/ext.advancedSearch.init.js
index 63f83fe..2cce22c 100644
--- a/modules/ext.advancedSearch.init.js
+++ b/modules/ext.advancedSearch.init.js
@@ -156,7 +156,10 @@
init: function () {
return new
mw.libs.advancedSearch.ui.ArbitraryWordInput(
state,
- { optionId: 'phrase' }
+ {
+ optionId: 'phrase',
+ placeholder: mw.msg(
'advancedSearch-placeholder-commas' )
+ }
);
}
},
@@ -181,7 +184,10 @@
init: function () {
return new
mw.libs.advancedSearch.ui.ArbitraryWordInput(
state,
- { optionId: 'or' }
+ {
+ optionId: 'or',
+ placeholder: mw.msg(
'advancedSearch-placeholder-commas' )
+ }
);
}
},
--
To view, visit https://gerrit.wikimedia.org/r/383772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id393b25d6d61846e1f37d4b05148c3dd5c7b2a3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw
