diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index da4bc0635..7acf173ed 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -3,6 +3,7 @@ - fixed #11198: Typo in i18n - fixed #11202: USPS driver does not log authentication errors - fixed #10985: Survey: can't add multiple choice answer + - fixed #11197: Survey Edit Console is not i18n'ed 7.8.3 - Rewrote Spectre's workflow queues to prevent it from "forgetting" about some workflows. diff --git a/docs/upgrades/packages-7.8.4/root_import_survey_default-survey-edit.wgpkg b/docs/upgrades/packages-7.8.4/root_import_survey_default-survey-edit.wgpkg new file mode 100644 index 000000000..bfcde892d Binary files /dev/null and b/docs/upgrades/packages-7.8.4/root_import_survey_default-survey-edit.wgpkg differ diff --git a/lib/WebGUI/i18n/English/Asset_Survey.pm b/lib/WebGUI/i18n/English/Asset_Survey.pm index aa3d5bfb7..493002a11 100644 --- a/lib/WebGUI/i18n/English/Asset_Survey.pm +++ b/lib/WebGUI/i18n/English/Asset_Survey.pm @@ -923,37 +923,37 @@ directly inside the answer_loop for other types of questions.|, context => q|Description of a template variable for a template Help page.|, lastUpdated => 1149654771, }, - + response_feedback_url => { message => q|The URL of the individual response feedback page.|, context => q|Description of a template variable for a template Help page.|, lastUpdated => 0, }, - + response_id => { message => q|The unique ID of the response.|, context => q|Description of a template variable for a template Help page.|, lastUpdated => 0, }, - + response_userId => { message => q|The userId of the user that completed the response.|, context => q|Description of a template variable for a template Help page.|, lastUpdated => 0, }, - + response_ip => { message => q|The IP Address of the user that completed the response.|, context => q|Description of a template variable for a template Help page.|, lastUpdated => 0, }, - + response_startDate => { message => q|The Start Date of the response.|, context => q|Description of a template variable for a template Help page.|, lastUpdated => 0, }, - + response_endDate => { message => q|The End Date of the response.|, context => q|Description of a template variable for a template Help page.|, @@ -981,7 +981,7 @@ directly inside the answer_loop for other types of questions.|, message => q|A boolean flag indicating whether the Survey Response completed|, lastUpdated => 1242180657, }, - + 'responseId help' => { message => q|The unique GUID for the response|, lastUpdated => 1242180657, @@ -1031,7 +1031,7 @@ directly inside the answer_loop for other types of questions.|, message => q|All data tagged in survey expressions is also made available as template variables|, lastUpdated => 1242180657, }, - + 'survey test results template title' => { message => q|Survey Test Results Template Variables|, lastUpdated => 1242256111, @@ -1579,117 +1579,132 @@ section/answer.|, context => q|Finish button label on Take Survey page|, lastUpdated => 0, }, - + 'add a test' => { message => q{Add a test}, lastUpdated => 0, }, - + 'confirm delete test' => { message => q{Are you sure you want to delete this test?}, lastUpdated => 0, }, - + 'test suite' => { message => q{Test Suite}, lastUpdated => 0, }, - + 'edit test' => { message => q{Edit Test}, lastUpdated => 0, }, - + 'run test' => { message => q{Run Test}, lastUpdated => 0, }, - + 'test name' => { message => q{Test Name}, lastUpdated => 0, }, - + 'tests run' => { message => q{Tests Run}, lastUpdated => 0, }, - + 'test name help' => { message => q{A descriptive name for this test}, lastUpdated => 0, }, - + 'test spec' => { message => q{Test Spec}, lastUpdated => 0, }, - + 'test spec help' => { message => q{The JSON-encoded specification for your test(s)}, lastUpdated => 0, }, - + 'run all tests' => { message => q{Run All Tests}, lastUpdated => 0, }, - + 'pass' => { message => q{Pass}, lastUpdated => 0, }, - + 'fail' => { message => q{Fail}, lastUpdated => 0, }, - + 'test results template' => { message => q{Test Results Template}, lastUpdated => 0, }, - + 'test results template help' => { message => q{Template used to display individual test and aggregate test results}, lastUpdated => 0, }, - + 'test results' => { message => q{Test Results}, lastUpdated => 0, }, - + 'test result' => { message => q{Test Result}, lastUpdated => 0, }, - + 'details' => { message => q{Details}, lastUpdated => 0, }, - + 'tests passed' => { message => q{Tests Passed}, lastUpdated => 0, }, - + 'tests failed' => { message => q{Tests Failed}, lastUpdated => 0, }, - + 'start date' => { message => q{Start Date}, lastUpdated => 0, }, - + 'end date' => { message => q{End Date}, lastUpdated => 0, }, + 'Add Question' => { + message => q{Add Question}, + lastUpdated => 0, + }, + + 'Add Answer' => { + message => q{Add Answer}, + lastUpdated => 0, + }, + + 'Survey Objects' => { + message => q{Survey Objects}, + lastUpdated => 0, + }, + }; 1; diff --git a/www/extras/wobject/Survey/editsurvey.js b/www/extras/wobject/Survey/editsurvey.js index 8fa8f98c4..624d7b9a8 100644 --- a/www/extras/wobject/Survey/editsurvey.js +++ b/www/extras/wobject/Survey/editsurvey.js @@ -99,7 +99,7 @@ Survey.Data = (function(){ draggable: true }); - Survey.Data.ddContainer.setHeader("Survey Objects..."); + Survey.Data.ddContainer.setHeader(Survey.i18n.get('Asset_Survey','Survey Objects'); Survey.Data.ddContainer.setBody(d.ddhtml); Survey.Data.ddContainer.setFooter(document.getElementById("buttons")); Survey.Data.ddContainer.render(); @@ -146,7 +146,7 @@ Survey.Data = (function(){ if (!sButton) { sButton = new YAHOO.widget.Button({ - label: "Add Section", + label: Survey.i18n.get('Asset_Survey','Add Section'), id: "addSection", container: "addSection" }); @@ -155,7 +155,7 @@ Survey.Data = (function(){ if (!qButton) { qButton = new YAHOO.widget.Button({ - label: "Add Question", + label: Survey.i18n.get('Asset_Survey', 'Add Question'), id: "addQuestion", container: "addQuestion" }); @@ -212,6 +212,20 @@ Survey.Data = (function(){ // Initialize survey YAHOO.util.Event.onDOMReady(function(){ //var ddTarget = new YAHOO.util.DDTarget("sections", "sections"); - Survey.Comm.loadSurvey(); - Survey.ObjectTemplate.initObjectEditor(); + Survey.i18n = new WebGUI.i18n( { + 'namespaces' : { + 'Asset_Survey' : [ + 'Add Question', + 'Add Answer', + 'Add Section', + 'Survey Objects' + ] + }, + onpreload : { + fn : function () { + Survey.Comm.loadSurvey(); + Survey.ObjectTemplate.initObjectEditor(); + } + } + } ); });