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

More progress on ticket:1919

Browse source 
These messages now don't use JavaScript string concatenation but
variable interpolation:

 * browse.start_rjs.history_for_feature
 * browse.start_rjs.edited_by_user_at_timestamp
 * browse.start_rjs.object_list.selected.type.node
 * browse.start_rjs.object_list.selected.type.way
 * browse.start_rjs.object_list.history.type.node
 * browse.start_rjs.object_list.history.type.way

These previously extant messages have been deleted, merged, and given
more descriptive names:

 * browse.start_rjs.history_for
 * browse.start_rjs.edited_by
 * browse.start_rjs.at_timestamp
This commit is contained in:
Ævar Arnfjörð Bjarmason 2009-06-06 19:22:39 +00:00
parent f9e5cdbb93
commit cc5694da1c
12 changed files with 37 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -421,7 +421,7 @@ page << <<EOJ
table.appendChild(tr);
var heading = document.createElement("td");
heading.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.history_for')} " + featureNameHistory(this.feature)));
heading.appendChild(document.createTextNode(i18n_js("#{I18n.t('browse.start_rjs.history_for_feature', :feature => '{{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.t('browse.start_rjs.edited_by')} " + user + " #{I18n.t('browse.start_rjs.at_timestamp')} " + timestamp));
item.appendChild(document.createTextNode(i18n_js("#{I18n.t('browse.start_rjs.edited_by_user_at_timestamp', :user => '{{user}}', :timestamp => '{{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.t('browse.start_rjs.object_list.selected.type.node')} " + feature.osm_id;
return i18n_js("#{I18n.t('browse.start_rjs.object_list.selected.type.node', :id => '{{id}}')}", { id: feature.osm_id });
} else if (featureType(feature) == "way") {
return "#{I18n.t('browse.start_rjs.object_list.selected.type.way')} " + feature.osm_id;
return i18n_js("#{I18n.t('browse.start_rjs.object_list.selected.type.way', :id => '{{id}}')}", { id: feature.osm_id });
}
}
@ -480,9 +480,9 @@ page << <<EOJ
if (feature.attributes.name) {
return feature.attributes.name;
} else if (featureType(feature) == "node") {
return "#{I18n.t('browse.start_rjs.object_list.history.type.node')} " + feature.osm_id;
return i18n_js("#{I18n.t('browse.start_rjs.object_list.history.type.node', :id => '{{id}}')}", { id: feature.osm_id });
} else if (featureType(feature) == "way") {
return "#{I18n.t('browse.start_rjs.object_list.history.type.way')} " + feature.osm_id;
return i18n_js("#{I18n.t('browse.start_rjs.object_list.history.type.way', :id => '{{id}}')}", { id: feature.osm_id });
}
}