Skip to content

Commit 22322bd

Browse files
wetnebwetneb
authored
Merge pull request #1846 from OpenRefine/new_i18n
Migrate to Wikimedia's i18n jQuery library
2 parents b9871dd + 333c027 commit 22322bd

File tree

76 files changed

+1158
-1117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1158
-1117
lines changed

‎extensions/database/module/scripts/index/database-import-controller.js‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ $.ajax({
3939
module : "database",
4040
},
4141
success : function(data) {
42-
dictionary = data;
42+
dictionary = data['dictionary'];
43+
lang = data['lang'];
4344
}
4445
});
45-
$.i18n.setDictionary(dictionary);
46+
$.i18n().load(dictionary, lang);
4647
// End internationalization
4748

4849
Refine.DatabaseImportController = function(createProjectUI) {
@@ -60,7 +61,7 @@ Refine.DatabaseImportController = function(createProjectUI) {
6061
Refine.CreateProjectUI.controllers.push(Refine.DatabaseImportController);
6162

6263
Refine.DatabaseImportController.prototype.startImportingDocument = function(queryInfo) {
63-
var dismiss = DialogSystem.showBusy($.i18n._('database-import/preparing'));
64+
var dismiss = DialogSystem.showBusy($.i18n('database-import/preparing'));
6465
//alert(queryInfo.query);
6566
var self = this;
6667

@@ -138,19 +139,19 @@ Refine.DatabaseImportController.prototype._showParsingPanel = function() {
138139

139140
this._parsingPanelElmts = DOM.bind(this._parsingPanel);
140141

141-
this._parsingPanelElmts.startOverButton.html($.i18n._('database-parsing/start-over'));
142-
this._parsingPanelElmts.database_conf_pars.html($.i18n._('database-parsing/conf-pars'));
143-
this._parsingPanelElmts.database_proj_name.html($.i18n._('database-parsing/proj-name'));
144-
this._parsingPanelElmts.createProjectButton.html($.i18n._('database-parsing/create-proj'));
145-
this._parsingPanelElmts.database_options.html($.i18n._('database-parsing/option'));
146-
this._parsingPanelElmts.previewButton.html($.i18n._('database-parsing/preview-button'));
147-
this._parsingPanelElmts.database_updating.html($.i18n._('database-parsing/updating-preview'));
148-
this._parsingPanelElmts.database_discard_next.html($.i18n._('database-parsing/discard-next'));
149-
this._parsingPanelElmts.database_discard.html($.i18n._('database-parsing/discard'));
150-
this._parsingPanelElmts.database_limit_next.html($.i18n._('database-parsing/limit-next'));
151-
this._parsingPanelElmts.database_limit.html($.i18n._('database-parsing/limit'));
152-
this._parsingPanelElmts.database_store_row.html($.i18n._('database-parsing/store-row'));
153-
this._parsingPanelElmts.database_store_cell.html($.i18n._('database-parsing/store-cell'));
142+
this._parsingPanelElmts.startOverButton.html($.i18n('database-parsing/start-over'));
143+
this._parsingPanelElmts.database_conf_pars.html($.i18n('database-parsing/conf-pars'));
144+
this._parsingPanelElmts.database_proj_name.html($.i18n('database-parsing/proj-name'));
145+
this._parsingPanelElmts.createProjectButton.html($.i18n('database-parsing/create-proj'));
146+
this._parsingPanelElmts.database_options.html($.i18n('database-parsing/option'));
147+
this._parsingPanelElmts.previewButton.html($.i18n('database-parsing/preview-button'));
148+
this._parsingPanelElmts.database_updating.html($.i18n('database-parsing/updating-preview'));
149+
this._parsingPanelElmts.database_discard_next.html($.i18n('database-parsing/discard-next'));
150+
this._parsingPanelElmts.database_discard.html($.i18n('database-parsing/discard'));
151+
this._parsingPanelElmts.database_limit_next.html($.i18n('database-parsing/limit-next'));
152+
this._parsingPanelElmts.database_limit.html($.i18n('database-parsing/limit'));
153+
this._parsingPanelElmts.database_store_row.html($.i18n('database-parsing/store-row'));
154+
this._parsingPanelElmts.database_store_cell.html($.i18n('database-parsing/store-cell'));
154155

155156
if (this._parsingPanelResizer) {
156157
$(window).unbind('resize', this._parsingPanelResizer);
@@ -362,7 +363,7 @@ Refine.DatabaseImportController.prototype._createProject = function() {
362363
},
363364
1000
364365
);
365-
self._createProjectUI.showImportProgressPanel($.i18n._('database-import/creating'), function() {
366+
self._createProjectUI.showImportProgressPanel($.i18n('database-import/creating'), function() {
366367
// stop the timed polling
367368
window.clearInterval(timerID);
368369

‎extensions/database/module/scripts/index/database-source-ui.js‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -64,20 +64,20 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) {
6464
this._elmts = DOM.bind(this._body);
6565
var self = this;
6666

67-
$('#database-title').text($.i18n._('database-import/title'));
68-
$('#connectionNameLabel').html($.i18n._('database-source/connectionNameLabel'));
69-
$('#databaseTypeLabel').html($.i18n._('database-source/databaseTypeLabel'));
70-
$('#databaseHostLabel').text($.i18n._('database-source/databaseHostLabel'));
71-
$('#databasePortLabel').text($.i18n._('database-source/databasePortLabel'));
72-
$('#databaseUserLabel').text($.i18n._('database-source/databaseUserLabel'));
73-
$('#databasePasswordLabel').text($.i18n._('database-source/databasePasswordLabel'));
74-
$('#databaseNameLabel').text($.i18n._('database-source/databaseNameLabel'));
75-
$('#databaseSchemaLabel').text($.i18n._('database-source/databaseSchemaLabel'));
76-
$('#databaseTestButton').text($.i18n._('database-source/databaseTestButton'));
77-
$('#databaseSaveButton').text($.i18n._('database-source/databaseSaveButton'));
78-
$('#databaseConnectButton').text($.i18n._('database-source/databaseConnectButton'));
79-
$('#newConnectionButtonDiv').text($.i18n._('database-source/newConnectionButtonDiv'));
80-
$('#savedConnectionSpan').text($.i18n._('database-source/savedConnectionSpan'));
67+
$('#database-title').text($.i18n('database-import/title'));
68+
$('#connectionNameLabel').html($.i18n('database-source/connectionNameLabel'));
69+
$('#databaseTypeLabel').html($.i18n('database-source/databaseTypeLabel'));
70+
$('#databaseHostLabel').text($.i18n('database-source/databaseHostLabel'));
71+
$('#databasePortLabel').text($.i18n('database-source/databasePortLabel'));
72+
$('#databaseUserLabel').text($.i18n('database-source/databaseUserLabel'));
73+
$('#databasePasswordLabel').text($.i18n('database-source/databasePasswordLabel'));
74+
$('#databaseNameLabel').text($.i18n('database-source/databaseNameLabel'));
75+
$('#databaseSchemaLabel').text($.i18n('database-source/databaseSchemaLabel'));
76+
$('#databaseTestButton').text($.i18n('database-source/databaseTestButton'));
77+
$('#databaseSaveButton').text($.i18n('database-source/databaseSaveButton'));
78+
$('#databaseConnectButton').text($.i18n('database-source/databaseConnectButton'));
79+
$('#newConnectionButtonDiv').text($.i18n('database-source/newConnectionButtonDiv'));
80+
$('#savedConnectionSpan').text($.i18n('database-source/savedConnectionSpan'));
8181

8282

8383
this._elmts.newConnectionButton.click(function(evt) {
@@ -129,7 +129,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) {
129129
if(self._validateNewConnectionForm() == true){
130130
var connectionNameInput = $.trim(self._elmts.connectionNameInput[0].value);
131131
if (connectionNameInput.length === 0) {
132-
window.alert($.i18n._('database-source/alert-connection-name'));
132+
window.alert($.i18n('database-source/alert-connection-name'));
133133
} else{
134134
self._saveConnection(self._getConnectionInfo());
135135
}
@@ -152,7 +152,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) {
152152
// if(jdbcQueryInfo.query && jdbcQueryInfo.query.length > 0 ) {
153153
// self._executeQuery(jdbcQueryInfo);
154154
// }else{
155-
// window.alert($.i18n._('database-source/alert-query'));
155+
// window.alert($.i18n('database-source/alert-query'));
156156
// }
157157

158158
if(self.validateQuery(jdbcQueryInfo.query)) {
@@ -171,7 +171,7 @@ Refine.DatabaseSourceUI.prototype.attachUI = function(body) {
171171
if(self._validateNewConnectionForm() == true){
172172
var connectionNameInput = $.trim(self._elmts.connectionNameInput[0].value);
173173
if (connectionNameInput.length === 0) {
174-
window.alert($.i18n._('database-source/alert-connection-name'));
174+
window.alert($.i18n('database-source/alert-connection-name'));
175175
} else{
176176
self._editConnection(self._getConnectionInfo());
177177
}
@@ -198,38 +198,38 @@ Refine.DatabaseSourceUI.prototype.focus = function() {
198198
Refine.DatabaseSourceUI.prototype.validateQuery = function(query) {
199199
//alert("query::" + query);
200200
if(!query || query.length <= 0 ) {
201-
window.alert($.i18n._('database-source/alert-query'));
201+
window.alert($.i18n('database-source/alert-query'));
202202
return false;
203203
}
204204

205205
var allCapsQuery = query.toUpperCase();
206206

207207
if(allCapsQuery.indexOf('DROP') > -1){
208-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " DROP");
208+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " DROP");
209209
return false;
210210
}else if(allCapsQuery.indexOf('TRUNCATE') > -1){
211-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " TRUNCATE");
211+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " TRUNCATE");
212212
return false;
213213
}else if(allCapsQuery.indexOf('DELETE') > -1){
214-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " DELETE");
214+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " DELETE");
215215
return false;
216216
}else if(allCapsQuery.indexOf('ROLLBACK') > -1){
217-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " ROLLBACK");
217+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " ROLLBACK");
218218
return false;
219219
}else if(allCapsQuery.indexOf('SHUTDOWN') > -1){
220-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " SHUTDOWN");
220+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " SHUTDOWN");
221221
return false;
222222
}else if(allCapsQuery.indexOf('INSERT') > -1){
223-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " INSERT");
223+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " INSERT");
224224
return false;
225225
}else if(allCapsQuery.indexOf('ALTER') > -1){
226-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " ALTER");
226+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " ALTER");
227227
return false;
228228
}else if(allCapsQuery.indexOf('UPDATE') > -1){
229-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " UPDATE");
229+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " UPDATE");
230230
return false;
231231
}else if(allCapsQuery.indexOf('LIMIT') > -1){
232-
window.alert($.i18n._('database-source/alert-invalid-query-keyword') + " LIMIT");
232+
window.alert($.i18n('database-source/alert-invalid-query-keyword') + " LIMIT");
233233
return false;
234234
}
235235

@@ -238,12 +238,12 @@ Refine.DatabaseSourceUI.prototype.validateQuery = function(query) {
238238
// || (allCapsQuery.indexOf('SHUTDOWN') > -1) || (allCapsQuery.indexOf('INSERT') > -1)
239239
// || (allCapsQuery.indexOf('ALTER') > -1) || (allCapsQuery.indexOf('UPDATE') > -1))
240240
// {
241-
// window.alert($.i18n._('database-source/alert-invalid-query-keyword'));
241+
// window.alert($.i18n('database-source/alert-invalid-query-keyword'));
242242
// return false;
243243
// }
244244

245245
if(!allCapsQuery.startsWith('SELECT')) {
246-
window.alert($.i18n._('database-source/alert-invalid-query-select'));
246+
window.alert($.i18n('database-source/alert-invalid-query-select'));
247247
return false;
248248
}
249249

@@ -273,7 +273,7 @@ Refine.DatabaseSourceUI.prototype._editConnection = function(connectionInfo) {
273273
})
274274

275275
$( "#menuListUl" ).append(items.join(''));
276-
window.alert($.i18n._('database-source/alert-connection-edit'));
276+
window.alert($.i18n('database-source/alert-connection-edit'));
277277
}
278278
}
279279
}).fail(function( jqXhr, textStatus, errorThrown ){
@@ -286,7 +286,7 @@ Refine.DatabaseSourceUI.prototype._executeQuery = function(jdbcQueryInfo) {
286286
var self = this;
287287
//remove start line
288288

289-
var dismiss = DialogSystem.showBusy($.i18n._('database-import/checking'));
289+
var dismiss = DialogSystem.showBusy($.i18n('database-import/checking'));
290290
//$("#executeQueryBtn").text('Please wait ...').attr('disabled','disabled');
291291

292292
$.post(
@@ -467,16 +467,16 @@ Refine.DatabaseSourceUI.prototype._validateNewConnectionForm = function() {
467467
var initialSchemaInput = $.trim(self._elmts.initialSchemaInput[0].value);
468468

469469
if (databaseHostInput.length === 0) {
470-
window.alert($.i18n._('database-source/alert-server'));
470+
window.alert($.i18n('database-source/alert-server'));
471471
return false;
472472
}else if(databasePortInput.length === 0){
473-
window.alert($.i18n._('database-source/alert-port'));
473+
window.alert($.i18n('database-source/alert-port'));
474474
return false;
475475
}else if(databaseUserInput.length === 0){
476-
window.alert($.i18n._('database-source/alert-user'));
476+
window.alert($.i18n('database-source/alert-user'));
477477
return false;
478478
}else if(initialDatabaseInput.length === 0){
479-
window.alert($.i18n._('database-source/alert-initial-database'));
479+
window.alert($.i18n('database-source/alert-initial-database'));
480480
return false;
481481
}
482482
else{

‎extensions/database/module/scripts/project/database-exporters.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ $.ajax({
3737

3838
},
3939
success : function(data) {
40-
dictionary = data;
40+
dictionary = data['dictionary'];
41+
dictionary = data['lang'];
4142
}
4243
});
43-
$.i18n.setDictionary(dictionary);
44+
$.i18n().load(dictionary, lang);
4445
// End internationalization
4546

4647
(function() {

‎extensions/gdata/module/scripts/index/gdata-source-ui.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) {
4141
this._body.html(DOM.loadHTML("gdata", "scripts/index/import-from-gdata-form.html"));
4242
this._elmts = DOM.bind(this._body);
4343

44-
$('#gdata-title').text($.i18n._('gdata-import/title'));
45-
$('#gdata-import').html($.i18n._('gdata-import/import-by-url'));
46-
$('#gdata-next').html($.i18n._("gdata-import")["next->"]);
47-
$('#gdata-auth-doc').text($.i18n._('gdata-import/auth-doc'));
48-
$('#gdata-please').text($.i18n._('gdata-import/please'));
49-
$('#gdata-signin-btn').text($.i18n._('gdata-import/sign-in'));
50-
$('#gdata-access-data').text($.i18n._('gdata-import/access-data'));
51-
$('#gdata-retrieving').text($.i18n._('gdata-import/retrieving'));
52-
$('#gdata-signout').text($.i18n._('gdata-import/sign-out'));
53-
$('#gdata-resignin').text($.i18n._('gdata-import/re-sign-in'));
54-
$('#gdata-another-account').text($.i18n._('gdata-import/another-account'));
44+
$('#gdata-title').text($.i18n('gdata-import/title'));
45+
$('#gdata-import').html($.i18n('gdata-import/import-by-url'));
46+
$('#gdata-next').html($.i18n('gdata-import')["next->"]);
47+
$('#gdata-auth-doc').text($.i18n('gdata-import/auth-doc'));
48+
$('#gdata-please').text($.i18n('gdata-import/please'));
49+
$('#gdata-signin-btn').text($.i18n('gdata-import/sign-in'));
50+
$('#gdata-access-data').text($.i18n('gdata-import/access-data'));
51+
$('#gdata-retrieving').text($.i18n('gdata-import/retrieving'));
52+
$('#gdata-signout').text($.i18n('gdata-import/sign-out'));
53+
$('#gdata-resignin').text($.i18n('gdata-import/re-sign-in'));
54+
$('#gdata-another-account').text($.i18n('gdata-import/another-account'));
5555

5656
var self = this;
5757
this._body.find('.gdata-signin.button').click(function() {
@@ -74,7 +74,7 @@ Refine.GDataSourceUI.prototype.attachUI = function(body) {
7474
this._elmts.urlNextButton.click(function(evt) {
7575
var url = $.trim(self._elmts.urlInput[0].value);
7676
if (url.length === 0) {
77-
window.alert($.i18n._('gdata-source/alert-url'));
77+
window.alert($.i18n('gdata-source/alert-url'));
7878
} else {
7979
var doc = {};
8080
doc.docSelfLink = url;
@@ -130,10 +130,10 @@ Refine.GDataSourceUI.prototype._renderDocuments = function(o) {
130130
var table = $(
131131
'<table><tr>' +
132132
'<th></th>' + // starred
133-
'<th>'+$.i18n._('gdata-source/type')+'</th>' +
134-
'<th>'+$.i18n._('gdata-source/title')+'</th>' +
135-
'<th>'+$.i18n._('gdata-source/authors')+'</th>' +
136-
'<th>'+$.i18n._('gdata-source/updated')+'</th>' +
133+
'<th>'+$.i18n('gdata-source/type')+'</th>' +
134+
'<th>'+$.i18n('gdata-source/title')+'</th>' +
135+
'<th>'+$.i18n('gdata-source/authors')+'</th>' +
136+
'<th>'+$.i18n('gdata-source/updated')+'</th>' +
137137
'</tr></table>'
138138
).appendTo(this._elmts.listingContainer)[0];
139139

0 commit comments

Comments
 (0)