Skip to content

Commit 72112da

Browse files
smartinkcsmartinkc
committed
update
1 parent 18704a7 commit 72112da

File tree

2 files changed

+55
-35
lines changed

2 files changed

+55
-35
lines changed

‎js/multilingual_setup.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@
186186
else if(tags[id].indexOf('p1000surveytext') > -1){
187187
survey_text = JSON.parse(tags[id].replace('p1000surveytext',''));
188188
}
189-
else{
190-
others += tags[id] + '\n';
189+
else if(tags[id] != ''){
190+
others += '@' + tags[id] + ' ';
191191
}
192192
}
193193

‎js/multilingual_survey_return.js‎

Lines changed: 53 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
settings['empty'] = true;
1212
var lang = 'en';
1313
var errorChecking = 0;
14+
var hasCode = 0;
1415

1516
//document ready change language
1617
$( document ).ready(function(){
@@ -73,42 +74,61 @@
7374

7475
if($('#return_instructions').length && curLang > 0 && settings['save-return-page-popup-title']['value'][curLang]){
7576
//popup
76-
$('#ui-id-1').html(settings['save-return-page-popup-title']['value'][curLang]);
77-
$('#codePopupReminderText').html(settings['save-return-page-popup-body']['value'][curLang]);
78-
var html = $('#codePopupReminderTextCode').html();
79-
html = html.split('<span');
80-
$('#codePopupReminderTextCode').html('<b>' + settings['save-return-page-popup-return-code']['value'][curLang] + ':</b> <span' + html[1]);
81-
$('.ui-dialog-buttonpane').find('button').html('&#x2716;');
82-
77+
if($('#ui-id-1').is(':visible')){
78+
$('#ui-id-1').html(settings['save-return-page-popup-title']['value'][curLang]);
79+
$('#codePopupReminderText').html(settings['save-return-page-popup-body']['value'][curLang]);
80+
var html = $('#codePopupReminderTextCode').html();
81+
html = html.split('<span');
82+
$('#codePopupReminderTextCode').html('<b>' + settings['save-return-page-popup-return-code']['value'][curLang] + ':</b> <span' + html[1]);
83+
$('.ui-dialog-buttonpane').find('button').html('&#x2716;');
84+
85+
hasCode = 1;
86+
}
87+
8388
//return page-popup-body
8489
$('#return_instructions').find('h4').html('<b>' + settings['save-return-page-title']['value'][curLang] + '</b>');
8590

86-
html = $('#return_instructions').find('div').html().split('<div');
87-
html[0] = settings['save-return-page-instructions']['value'][curLang];
88-
89-
html[1] = html[1].split(/<br>/g);
90-
html[1][1] = settings['save-return-page-return-code-instructions']['value'][curLang];
91-
92-
html[1][2] = html[1][2].split('<span');
93-
html[1][2][0] = settings['save-return-page-popup-return-code']['value'][curLang];
94-
html[1][2] = html[1][2][0] + '<span' + html[1][2][1];
95-
96-
html[1] = html[1][0] + '<br>' + html[1][1] + '<br>' + html[1][2] + '<br>' + html[1][3] + '<br>';
97-
98-
$('#return_instructions').find('div').html(html[0] + '<div' + html[1] + '<div' + html[2] + '<div' + html[3] + '<div' + html[4]);
99-
$('#return_instructions').find('u').eq(0).html(settings['save-return-page-popup-return-code']['value'][curLang]);
100-
$('#return_instructions').find('u').eq(1).html(settings['save-return-page-survey-link-title']['value'][curLang]);
101-
102-
html = $('#provideEmail').html().split('<br>');
103-
$('#provideEmail').html(settings['save-return-page-email-instructions']['value'][curLang] + '<br>' + html[1] + '<br>' + html[2] + '<br>' + html[3]);
104-
105-
$('#sendLinkBtn').html(settings['save-return-page-email-button']['value'][curLang]);
106-
107-
$('#return_continue_form').find('b').eq(0).html(settings['save-return-page-continue-title']['value'][curLang]);
108-
$('#return_continue_form').find('button').eq(0).html(settings['save-return-later-continue-button']['value'][curLang]);
109-
110-
$('#return_instructions').find('span').eq(4).html('');
111-
$('#return_instructions').find('span').eq(1).html('');
91+
if(hasCode == 1){
92+
html = $('#return_instructions').find('div').html().split('<div');
93+
html[0] = settings['save-return-page-instructions']['value'][curLang];
94+
95+
html[1] = html[1].split(/<br>/g);
96+
html[1][1] = settings['save-return-page-return-code-instructions']['value'][curLang];
97+
98+
html[1][2] = html[1][2].split('<span');
99+
html[1][2][0] = settings['save-return-page-popup-return-code']['value'][curLang];
100+
html[1][2] = html[1][2][0] + '<span' + html[1][2][1];
101+
102+
html[1] = html[1][0] + '<br>' + html[1][1] + '<br>' + html[1][2] + '<br>' + html[1][3] + '<br>';
103+
104+
$('#return_instructions').find('div').html(html[0] + '<div' + html[1] + '<div' + html[2] + '<div' + html[3] + '<div' + html[4]);
105+
$('#return_instructions').find('u').eq(0).html(settings['save-return-page-popup-return-code']['value'][curLang]);
106+
$('#return_instructions').find('u').eq(1).html(settings['save-return-page-survey-link-title']['value'][curLang]);
107+
108+
html = $('#provideEmail').html().split('<br>');
109+
$('#provideEmail').html(settings['save-return-page-email-instructions']['value'][curLang] + '<br>' + html[1] + '<br>' + html[2] + '<br>' + html[3]);
110+
111+
$('#sendLinkBtn').html(settings['save-return-page-email-button']['value'][curLang]);
112+
113+
$('#return_continue_form').find('b').eq(0).html(settings['save-return-page-continue-title']['value'][curLang]);
114+
$('#return_continue_form').find('button').eq(0).html(settings['save-return-later-continue-button']['value'][curLang]);
115+
116+
$('#return_instructions').find('span').eq(4).html('');
117+
$('#return_instructions').find('span').eq(1).html('');
118+
}
119+
else{
120+
$('#return_instructions').find('div').eq(0).html(settings['save-return-page-instructions']['value'][curLang]);
121+
$('#return_instructions').find('div').eq(1).find('u').eq(0).html(settings['save-return-page-survey-link-title']['value'][curLang]);
122+
123+
var html = $('#provideEmail').html().split('<br>');
124+
html[0] = settings['save-return-page-email-instructions']['value'][curLang];
125+
126+
$('#provideEmail').html(html[0] + '<br>' + html[1] + '<br>' + html[2] + '<br>');
127+
$('#provideEmail').find('button').eq(0).html(settings['save-return-page-email-button']['value'][curLang]);
128+
129+
$('#return_continue_form').find('b').eq(0).html(settings['save-return-page-continue-title']['value'][curLang]);
130+
$('#return_continue_form').find('button').eq(0).html(settings['save-return-later-continue-button']['value'][curLang]);
131+
}
112132
}
113133
else if($('#surveytitle').length && curLang > 0 && settings['save-return-page-survey-title']['value'][curLang]){
114134
//continue page if cookie still set

0 commit comments

Comments
 (0)