Robmoen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/232862
Change subject: Pull in survey module and use messages for internal survey
......................................................................
Pull in survey module and use messages for internal survey
Change-Id: I68d62fd2d6cc4021f897aa2bdc75de49387cd75c
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/ext.quicksurveys.init/init.js
4 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/QuickSurveys
refs/changes/62/232862/1
diff --git a/extension.json b/extension.json
index ad72991..8229c7f 100644
--- a/extension.json
+++ b/extension.json
@@ -98,7 +98,7 @@
"@question": "survey question message key",
"question":
"ext-quicksurveys-example-internal-survey-question",
"@description": "The message key of the
description of the survey. Displayed immediately below the survey question.",
- "description": "",
+ "description":
"ext-quicksurveys-example-internal-survey-description",
"@answers": "possible answer message keys for
positive, neutral, and negative",
"answers": {
"positive":
"ext-quicksurveys-example-internal-survey-answer-positive",
diff --git a/i18n/en.json b/i18n/en.json
index 8641787..cb37544 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,6 +9,7 @@
},
"quicksurveys-desc": "Displays configured surveys on Mobile and
Desktop.",
"ext-quicksurveys-example-internal-survey-question": "Should the text
be bigger?",
+ "ext-quicksurveys-example-internal-survey-description": "This is the
description of the example internal survey",
"ext-quicksurveys-example-internal-survey-answer-positive": "Yes",
"ext-quicksurveys-example-internal-survey-answer-neutral": "Not sure",
"ext-quicksurveys-example-internal-survey-answer-negative": "No",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index f73098f..614a52b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -10,11 +10,12 @@
},
"quicksurveys-desc":
"{{desc|name=QuickSurveys|url=https://www.mediawiki.org/wiki/Extension:QuickSurveys}}";,
"ext-quicksurveys-example-internal-survey-question": "The question for
the example internal survey",
+ "ext-quicksurveys-example-internal-survey-description": "Description of
the example internal survey",
"ext-quicksurveys-example-internal-survey-answer-positive": "The
positive answer for the example internal survey\n{{Identical|Yes}}",
"ext-quicksurveys-example-internal-survey-answer-neutral": "The neutral
answer for the example internal survey\n{{Identical|Not sure}}",
"ext-quicksurveys-example-internal-survey-answer-negative": "The
negative answer for the example internal survey\n{{Identical|No}}",
"ext-quicksurveys-example-external-survey-link": "Web link to the
external survey",
- "ext-quicksurveys-example-external-survey-description": "description of
the example survey",
+ "ext-quicksurveys-example-external-survey-description": "Description of
the example external survey",
"ext-quicksurveys-example-external-survey-privacy-policy-link": "Web
link to the privacy policy",
"ext-quicksurveys-example-external-survey-privacy-policy-text": "text
of the privacy policy link\n{{Identical|Privacy policy}}",
"ext-quicksurveys-survey-privacy-policy-default-text": "Default
disclaimer about submitting surveys.",
diff --git a/resources/ext.quicksurveys.init/init.js
b/resources/ext.quicksurveys.init/init.js
index 2708aa8..66af138 100644
--- a/resources/ext.quicksurveys.init/init.js
+++ b/resources/ext.quicksurveys.init/init.js
@@ -32,13 +32,13 @@
} else {
$panel.appendTo( $bodyContent );
}
- mw.loader.using( 'ext.quicksurveys.views'
).done( function () {
+ mw.loader.using( [ survey.module,
'ext.quicksurveys.views' ] ).done( function () {
var panel;
panel = new
mw.extQuickSurveys.views.QuickSurvey( {
survey: survey,
templateData: {
- question:
survey.question,
- description:
survey.description
+ question: mw.msg(
survey.question ),
+ description: mw.msg(
survey.description )
}
} );
$panel.replaceWith( panel.$element );
--
To view, visit https://gerrit.wikimedia.org/r/232862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68d62fd2d6cc4021f897aa2bdc75de49387cd75c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/QuickSurveys
Gerrit-Branch: dev
Gerrit-Owner: Robmoen <rm...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
