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

Improve the data browser translation logic.

Browse source
This commit is contained in:
Tom Hughes 2009-06-06 15:46:41 +00:00
parent c875a70b31
commit 91aaae1933
2 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -249,19 +249,15 @@ page << <<EOJ
browseObjectList.appendChild(heading); browseObjectList.appendChild(heading);
var list = document.createElement("ul"); var list = document.createElement("ul");
// Pull in 118n names for node/way/relation
var typeTranslations = new Array();
typeTranslations['node'] = "#{I18n.t('browse.start_rjs.object_list.type.node')}"
typeTranslations['way'] = "#{I18n.t('browse.start_rjs.object_list.type.way')}"
typeTranslations['relation'] = "#{I18n.t('browse.start_rjs.object_list.type.relation')}"
for (var i = 0; i < this.features.length; i++) { for (var i = 0; i < this.features.length; i++) {
var feature = this.features[i]; var feature = this.features[i];
// Type, for linking // Type, for linking
var type = featureType(feature); var type = featureType(feature);
var typeName = featureTypeName(feature);
var li = document.createElement("li"); var li = document.createElement("li");
li.appendChild(document.createTextNode(typeTranslations[type] + " ")); li.appendChild(document.createTextNode(typeName + " "));
// Link, for viewing in the tab // Link, for viewing in the tab
var link = document.createElement("a"); var link = document.createElement("a");
@ -461,28 +457,32 @@ page << <<EOJ
return "way"; return "way";
} }
} }
function featureTypeName(feature) {
if (featureType(feature) == "node") {
return "#{I18n.t('browse.start_rjs.object_list.type.node')}";
} else if (featureType(feature) == "way") {
return "#{I18n.t('browse.start_rjs.object_list.type.way')}";
}
}
function featureNameSelect(feature) { function featureNameSelect(feature) {
if (feature.attributes.name) { if (feature.attributes.name) {
return feature.attributes.name; return feature.attributes.name;
} else { } else if (featureType(feature) == "node") {
// Pull in 118n names for node/way return "#{I18n.t('browse.start_rjs.object_list.selected.type.node')} " + feature.osm_id;
var featureNameSelectTypeTranslations = new Array(); } else if (featureType(feature) == "way") {
featureNameSelectTypeTranslations['node'] = "#{I18n.t('browse.start_rjs.object_list.selected.type.node')}" return "#{I18n.t('browse.start_rjs.object_list.selected.type.way')} " + feature.osm_id;
featureNameSelectTypeTranslations['way'] = "#{I18n.t('browse.start_rjs.object_list.selected.type.way')}"
return featureNameSelectTypeTranslations[featureType(feature)] + " " + feature.osm_id;
} }
} }
function featureNameHistory(feature) { function featureNameHistory(feature) {
if (feature.attributes.name) { if (feature.attributes.name) {
return feature.attributes.name; return feature.attributes.name;
} else { } else if (featureType(feature) == "node") {
// Pull in 118n names for node/way return "#{I18n.t('browse.start_rjs.object_list.history.type.node')} " + feature.osm_id;
var featureNameHistoryTypeTranslations = new Array(); } else if (featureType(feature) == "way") {
featureNameHistoryTypeTranslations['node'] = "#{I18n.t('browse.start_rjs.object_list.history.type.node')}" return "#{I18n.t('browse.start_rjs.object_list.history.type.way')} " + feature.osm_id;
featureNameHistoryTypeTranslations['way'] = "#{I18n.t('browse.start_rjs.object_list.history.type.way')}"
return featureNameHistoryTypeTranslations[featureType(feature)] + " " + feature.osm_id;
} }
} }
@ -496,9 +496,5 @@ page << <<EOJ
$("browse_status").style.display = "none"; $("browse_status").style.display = "none";
} }
function ucFirst(str) {
return str.substr(0,1).toUpperCase() + str.substr(1,str.length);
}
startBrowse(); startBrowse();
EOJ EOJ

2
config/locales/en.yml
View file

@ -168,7 +168,7 @@ en:
type: type:
node: "Node" node: "Node"
way: "Way" way: "Way"
relation: "Relation" # There's no 'relation' type because it isn't represented in OpenLayers
api: "Retrieve this are from the API" api: "Retrieve this are from the API"
details: "Details" details: "Details"
selected: selected: