cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework the javascript I18n interpolation a bit - the interpolation function

Browse source 
is now in site.js so everything can use it, and the syntax has changed a bit
to avoid the need for double interpolation.
This commit is contained in:
Tom Hughes 2009-06-07 08:32:39 +00:00
parent e1cb17faa6
commit fc398f6441
13 changed files with 93 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/views/browse/start.rjs
View file

@ -131,7 +131,7 @@ page << <<EOJ
var div = document.createElement("div");
var p = document.createElement("p");
p.appendChild(document.createTextNode(i18n_js("#{I18n.t('browse.start_rjs.loaded_an_area_with_num_features', :num_features => '{{num_features}}')}", { num_features: browseFeatureList.length })));
p.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.loaded_an_area_with_num_features')}", { num_features: browseFeatureList.length })));
div.appendChild(p);
var input = document.createElement("input");
@ -187,7 +187,7 @@ page << <<EOJ
var size = projected.getWidth() * projected.getHeight();
if (size > #{APP_CONFIG['max_request_area']}) {
setStatus(i18n_js("#{I18n.t('browse.start_rjs.unable_to_load_size', :bbox_size => '{{bbox_size}}', :max_bbox_size => APP_CONFIG['max_request_area'])}", { bbox_size: size }));
setStatus(i18n("#{I18n.t('browse.start_rjs.unable_to_load_size', :max_bbox_size => APP_CONFIG['max_request_area'])}", { bbox_size: size }));
} else {
loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
}
@ -421,7 +421,7 @@ page << <<EOJ
table.appendChild(tr);
var heading = document.createElement("td");
heading.appendChild(document.createTextNode(i18n_js("#{I18n.t('browse.start_rjs.history_for_feature', :feature => '{{feature}}')}", { feature: featureNameHistory(this.feature) })));
heading.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.history_for_feature')}", { feature: featureNameHistory(this.feature) })));
tr.appendChild(heading);
var td = document.createElement("td");
@ -442,7 +442,7 @@ page << <<EOJ
var user = nodes[i].getAttribute("user") || "#{I18n.t('browse.start_rjs.private_user')}";
var timestamp = nodes[i].getAttribute("timestamp");
var item = document.createElement("li");
item.appendChild(document.createTextNode(i18n_js("#{I18n.t('browse.start_rjs.edited_by_user_at_timestamp', :user => '{{user}}', :timestamp => '{{timestamp}}')}", { user: user, timestamp: timestamp })));
item.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.edited_by_user_at_timestamp')}", { user: user, timestamp: timestamp })));
history.appendChild(item);
}
div.appendChild(history);
@ -470,9 +470,9 @@ page << <<EOJ
if (feature.attributes.name) {
return feature.attributes.name;
} else if (featureType(feature) == "node") {
return i18n_js("#{I18n.t('browse.start_rjs.object_list.selected.type.node', :id => '{{id}}')}", { id: feature.osm_id });
return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.node')}", { id: feature.osm_id });
} else if (featureType(feature) == "way") {
return i18n_js("#{I18n.t('browse.start_rjs.object_list.selected.type.way', :id => '{{id}}')}", { id: feature.osm_id });
return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.way')}", { id: feature.osm_id });
}
}
@ -480,28 +480,12 @@ page << <<EOJ
if (feature.attributes.name) {
return feature.attributes.name;
} else if (featureType(feature) == "node") {
return i18n_js("#{I18n.t('browse.start_rjs.object_list.history.type.node', :id => '{{id}}')}", { id: feature.osm_id });
return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.node')}", { id: feature.osm_id });
} else if (featureType(feature) == "way") {
return i18n_js("#{I18n.t('browse.start_rjs.object_list.history.type.way', :id => '{{id}}')}", { id: feature.osm_id });
return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.way')}", { id: feature.osm_id });
}
}
/*
This is a hack so that we can interpolate JavaScript variables in
translation strings from Ruby, doing the string replacement
client-side instead of on the server.
*/
function i18n_js(string, keys) {
for (var key in keys) {
var re_key = '\{\{' + key + '\}\}';
var re = new RegExp(re_key, "g");
string = string.replace(re, keys[key]);
}
return string;
}
function setStatus(status) {
$("browse_status").innerHTML = status;
$("browse_status").style.display = "block";