From 942f11308a13b43a81094d17670c9a577334be2f Mon Sep 17 00:00:00 2001 From: Jocelyn Jaubert Date: Sat, 22 Oct 2011 23:38:18 +0200 Subject: Add more translation in javascript code --- web/i18n/en.yml | 13 ++++++++- web/i18n/fr.yml | 17 ++++++++++-- web/public/js/taginfo.js | 71 ++++++++++++++++++++++++++---------------------- web/taginfo.rb | 23 ++++++++++++++-- web/views/key.erb | 4 +-- web/views/tag.erb | 10 +++---- 6 files changed, 91 insertions(+), 47 deletions(-) (limited to 'web') diff --git a/web/i18n/en.yml b/web/i18n/en.yml index e53b31b..1b977bf 100644 --- a/web/i18n/en.yml +++ b/web/i18n/en.yml @@ -87,8 +87,11 @@ pages: nodes: Nodes only ways: Ways only relations: Relations only + number_objects: Number of objects values_used: Values used with this key - other_keys_used: Other keys used together with this key + other_keys_used: + title:: Other keys used together with this key + other: Other keys geographic_distribution: title: Geographical distribution of this key relations: Relations do not have a geographical location, so no map can be shown. @@ -101,6 +104,12 @@ pages: Choose style: tag: no_description_in_wiki: No description in wiki + wiki_pages: + title: Wiki pages about this tag + josm_rules: + title: JOSM style rules with this tag + choice: | + Choose style: flexigrid: pagetext: Page @@ -201,4 +210,6 @@ reports: misc: values_less_than_one_percent: all values have less than 1% empty_string: empty string + count: Count + all: All diff --git a/web/i18n/fr.yml b/web/i18n/fr.yml index 3b08099..4b33c5e 100644 --- a/web/i18n/fr.yml +++ b/web/i18n/fr.yml @@ -27,7 +27,7 @@ taginfo: map: Carte maps: Cartes key_combinations: Combinaisons - data_from: Données de + data_from: Données datant du instance: title: À propos de ce site Taginfo other: Visiter la page OSM wiki pour d'autres sites. @@ -83,8 +83,11 @@ pages: nodes: Seulement les nodes ways: Seulement les ways relations: Seulement les relations - values_used: Valeurs utilisés par cette clé - other_keys_used: Autres clés utilisées avec cette clé + number_objects: Quantité + values_used: Valeurs utilisées par cette clé + other_keys_used: + title: Autres clés utilisées avec cette clé + other: Autres clés geographic_distribution: title: Distribution géographique de cette clé relations: | @@ -99,6 +102,12 @@ pages: Choix du style : tag: no_description_in_wiki: Aucune description dans le wiki + wiki_pages: + title: Pages du wiki sur cette valeur + josm_rules: + title: Régles de style JOSM sur cette valeur + choice: | + Choix du style : flexigrid: pagetext: Page @@ -189,3 +198,5 @@ reports: misc: values_less_than_one_percent: Toutes les valeurs sont inférieures à 1% empty_string: chaîne de caractère vide + count: Quantité + all: Tous diff --git a/web/public/js/taginfo.js b/web/public/js/taginfo.js index c7956d2..6b6048e 100644 --- a/web/public/js/taginfo.js +++ b/web/public/js/taginfo.js @@ -97,7 +97,12 @@ String.prototype.capitalize = function() { function print_image(type) { type = type.replace(/s$/, ''); - var name = type.capitalize(); + var name; + if (type == 'all') { + name = texts.misc.all; + } else { + name = texts.osm[type]; + } return '[' + name + ']'; } @@ -270,7 +275,7 @@ var create_flexigrid_for = { create_flexigrid('grid-keys', { url: '/api/2/db/keys?include=prevalent_values', colModel: [ - { display: 'Key', name: 'key', width: 180, sortable: true }, + { display: texts.osm.key, name: 'key', width: 180, sortable: true }, { display: ' Total', name: 'count_all', width: 250, sortable: true, align: 'center' }, { display: ' Nodes', name: 'count_nodes', width: 250, sortable: true, align: 'center' }, { display: ' Ways', name: 'count_ways', width: 250, sortable: true, align: 'center' }, @@ -282,7 +287,7 @@ var create_flexigrid_for = { { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true } ], searchitems: [ - { display: 'Key', name: 'key' } + { display: texts.osm.key, name: 'key' } ], sortname: 'count_all', sortorder: 'desc', @@ -351,7 +356,7 @@ var create_flexigrid_for = { create_flexigrid('grid-josm', { url: '/api/2/josm/styles/standard/tags?key=' + encodeURIComponent(key) + '&value=' + encodeURIComponent(value), colModel: [ - { display: 'Value', name: 'v', width: 200, sortable: false }, + { display: texts.osm.value, name: 'v', width: 200, sortable: false }, { display: 'Rule XML', name: 'rule', width: 100, sortable: false } ], /* searchitems: [ @@ -377,11 +382,11 @@ var create_flexigrid_for = { create_flexigrid('grid-values', { url: '/api/2/db/keys/values?key=' + encodeURIComponent(key) + '&filter=' + encodeURIComponent(filter_type), colModel: [ - { display: 'Count', name: 'count', width: 300, sortable: true, align: 'center' }, - { display: 'Value', name: 'value', width: 500, sortable: true } + { display: texts.misc.count, name: 'count', width: 300, sortable: true, align: 'center' }, + { display: texts.osm.value, name: 'value', width: 500, sortable: true } ], searchitems: [ - { display: 'Value', name: 'value' } + { display: texts.osm.value, name: 'value' } ], sortname: 'count', sortorder: 'desc', @@ -402,9 +407,9 @@ var create_flexigrid_for = { create_flexigrid('grid-keys', { url: '/api/2/db/keys/keys?key=' + encodeURIComponent(key) + '&filter=' + encodeURIComponent(filter_type), colModel: [ - { display: 'Count →', name: 'to_count', width: 320, sortable: true, align: 'center' }, - { display: 'Other key', name: 'other_key', width: 340, sortable: true }, - { display: '→ Count', name: 'from_count', width: 320, sortable: true, align: 'center' } + { display: '' + texts.misc.count + ' →', name: 'to_count', width: 320, sortable: true, align: 'center' }, + { display: '' + texts.pages.key.other_keys_used.other + '', name: 'other_key', width: 340, sortable: true }, + { display: '→ ' + texts.misc.count + '', name: 'from_count', width: 320, sortable: true, align: 'center' } ], searchitems: [ { display: 'Other key', name: 'other_key' } @@ -428,11 +433,11 @@ var create_flexigrid_for = { create_flexigrid('grid-josm', { url: '/api/2/josm/styles/standard/keys?key=' + encodeURIComponent(key), colModel: [ - { display: 'Value', name: 'v', width: 200, sortable: true }, + { display: texts.osm.value, name: 'v', width: 200, sortable: true }, { display: 'Rule XML', name: 'rule', width: 100, sortable: false } ], searchitems: [ - { display: 'Value', name: 'v' } + { display: texts.osm.value, name: 'v' } ], sortname: 'v', sortorder: 'asc', @@ -493,8 +498,8 @@ var create_flexigrid_for = { create_flexigrid('grid-keys', { url: '/api/2/db/keys?query=' + encodeURIComponent(query), colModel: [ - { display: 'Count', name: 'count_all', width: 80, sortable: true, align: 'right' }, - { display: 'Key', name: 'key', width: 500, sortable: true } + { display: texts.misc.count, name: 'count_all', width: 80, sortable: true, align: 'right' }, + { display: texts.osm.key, name: 'key', width: 500, sortable: true } ], sortname: 'count_all', sortorder: 'desc', @@ -514,9 +519,9 @@ var create_flexigrid_for = { create_flexigrid('grid-values', { url: '/api/2/search/values?q=' + encodeURIComponent(query), colModel: [ - { display: 'Count', name: 'count_all', width: 80, sortable: true, align: 'right' }, - { display: 'Key', name: 'key', width: 250, sortable: true }, - { display: 'Value', name: 'value', width: 500, sortable: true } + { display: texts.misc.count, name: 'count_all', width: 80, sortable: true, align: 'right' }, + { display: texts.osm.key, name: 'key', width: 250, sortable: true }, + { display: texts.osm.value, name: 'value', width: 500, sortable: true } ], sortname: 'count_all', sortorder: 'desc', @@ -538,9 +543,9 @@ var create_flexigrid_for = { create_flexigrid('grid-tags', { url: '/api/2/search/tags?q=' + encodeURIComponent(query), colModel: [ - { display: 'Count', name: 'count_all', width: 80, sortable: true, align: 'right' }, - { display: 'Key', name: 'key', width: 300, sortable: true }, - { display: 'Value', name: 'value', width: 500, sortable: true } + { display: texts.misc.count, name: 'count_all', width: 80, sortable: true, align: 'right' }, + { display: texts.osm.key, name: 'key', width: 300, sortable: true }, + { display: texts.osm.value, name: 'value', width: 500, sortable: true } ], sortname: 'count_all', sortorder: 'desc', @@ -567,8 +572,8 @@ var create_flexigrid_for = { create_flexigrid('grid-rules', { url: '/api/2/josm/styles/' + stylename, colModel: [ - { display: 'Key', name: 'k', width: 200, sortable: true }, - { display: 'Value', name: 'v', width: 200, sortable: true }, + { display: texts.osm.key, name: 'k', width: 200, sortable: true }, + { display: texts.osm.value, name: 'v', width: 200, sortable: true }, { display: 'Rule XML', name: 'rule', width: 100, sortable: false } ], searchitems: [ @@ -600,11 +605,11 @@ var create_flexigrid_for = { { display: 'JOSM', name: 'in_josm', width: 20, sortable: true, align: 'center' }, // { display: 'Potlatch 2', name: 'in_potlatch', width: 20, sortable: true, align: 'center' }, // { display: 'Merkaartor', name: 'in_merkaartor', width: 20, sortable: true, align: 'center' }, - { display: 'Key', name: 'key', width: 260, sortable: true, align: 'left' }, + { display: texts.osm.key, name: 'key', width: 260, sortable: true, align: 'left' }, { display: 'Wiki Pages', name: 'wikipages', width: 400, sortable: false, align: 'left' } ], searchitems: [ - { display: 'Key', name: 'key' } + { display: texts.osm.key, name: 'key' } ], sortname: 'count_all', sortorder: 'desc', @@ -666,14 +671,14 @@ var create_flexigrid_for = { url: '/api/2/reports/frequently_used_keys_without_wiki_page?english=' + english, colModel: [ { display: 'Create Wiki Page...', name: 'create_wiki_page', width: 200, sortable: false }, - { display: 'Key', name: 'key', width: 180, sortable: true }, + { display: texts.osm.key, name: 'key', width: 180, sortable: true }, { display: 'Total', name: 'count_all', width: 70, sortable: true, align: 'right' }, { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' }, { display: 'Values', name: 'values_all', width: 70, sortable: true, align: 'right' }, { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true } ], searchitems: [ - { display: 'Key', name: 'key' } + { display: texts.osm.key, name: 'key' } ], sortname: 'count_all', sortorder: 'desc', @@ -698,7 +703,7 @@ var create_flexigrid_for = { create_flexigrid('grid-statistics', { colModel: [ { display: ' ', name: 'row', width: 10, sortable: true, align: 'center' }, - { display: 'Count', name: 'count', width: 40, sortable: true, align: 'right' }, + { display: texts.misc.count, name: 'count', width: 40, sortable: true, align: 'right' }, { display: 'Fraction', name: 'fraction', width: 60, sortable: true, align: 'right' }, { display: 'Characters in Key', name: 'characters', width: 810, sortable: true } ], @@ -711,7 +716,7 @@ var create_flexigrid_for = { create_flexigrid('grid-whitespace', { url: '/api/2/db/keys?filters=characters_space&include=prevalent_values', colModel: [ - { display: 'Key', name: 'key', width: 250, sortable: true }, + { display: texts.osm.key, name: 'key', width: 250, sortable: true }, { display: ' Total', name: 'count_all', width: 250, sortable: true, align: 'center' }, { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' }, { display: 'Wiki', name: 'in_wiki', width: 20, sortable: true, align: 'center' }, @@ -722,7 +727,7 @@ var create_flexigrid_for = { { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true } ], searchitems: [ - { display: 'Key', name: 'key' } + { display: texts.osm.key, name: 'key' } ], sortname: 'count_all', sortorder: 'desc', @@ -749,7 +754,7 @@ var create_flexigrid_for = { create_flexigrid('grid-problematic', { url: '/api/2/db/keys?filters=characters_problematic&include=prevalent_values', colModel: [ - { display: 'Key', name: 'key', width: 250, sortable: true }, + { display: texts.osm.key, name: 'key', width: 250, sortable: true }, { display: ' Total', name: 'count_all', width: 250, sortable: true, align: 'center' }, { display: 'Users', name: 'users_all', width: 44, sortable: true, align: 'right' }, { display: 'Wiki', name: 'in_wiki', width: 20, sortable: true, align: 'center' }, @@ -760,7 +765,7 @@ var create_flexigrid_for = { { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true } ], searchitems: [ - { display: 'Key', name: 'key' } + { display: texts.osm.key, name: 'key' } ], sortname: 'count_all', sortorder: 'desc', @@ -790,7 +795,7 @@ var create_flexigrid_for = { url: '/api/2/db/keys?include=prevalent_values', colModel: [ { display: 'Length', name: 'length', width: 60, sortable: true, align: 'right' }, - { display: 'Key', name: 'key', width: 180, sortable: true }, + { display: texts.osm.key, name: 'key', width: 180, sortable: true }, { display: 'Number of Objects', name: 'count_all', width: 250, sortable: true, align: 'center' }, { display: 'Wiki', name: 'in_wiki', width: 20, sortable: true, align: 'center' }, { display: 'JOSM', name: 'in_josm', width: 20, sortable: true, align: 'center' }, @@ -800,7 +805,7 @@ var create_flexigrid_for = { { display: 'Prevalent Values', name: 'prevalent_values', width: 500, sortable: true } ], searchitems: [ - { display: 'Key', name: 'key' } + { display: texts.osm.key, name: 'key' } ], sortname: 'length', sortorder: 'asc', diff --git a/web/taginfo.rb b/web/taginfo.rb index 67310eb..c65ce37 100755 --- a/web/taginfo.rb +++ b/web/taginfo.rb @@ -289,12 +289,29 @@ class Taginfo < Sinatra::Base :errormsg => trans.t.flexigrid.errormsg, }, :instance_description => { - :title => trans.t.taginfo.instance.title + :title => trans.t.taginfo.instance.title, }, :misc => { :values_less_than_one_percent => trans.t.misc.values_less_than_one_percent, - :empty_string => trans.t.misc.empty_string - } + :empty_string => trans.t.misc.empty_string, + :count => trans.t.misc.count, + :all => trans.t.misc.all, + }, + :osm => { + :value => trans.t.osm.value, + :values => trans.t.osm.values, + :node => trans.t.osm.node, + :way => trans.t.osm.way, + :relation => trans.t.osm.relation, + }, + :pages => { + :key => { + :other_keys_used => { + :other => trans.t.pages.key.other_keys_used.other, + }, + :number_objects => trans.t.pages.key.number_objects, + }, + }, }.to_json + ";\n" end diff --git a/web/views/key.erb b/web/views/key.erb index 90c06da..e332ef9 100644 --- a/web/views/key.erb +++ b/web/views/key.erb @@ -43,7 +43,7 @@
-

<%= t.pages.key.other_keys_used %>

+

<%= t.pages.key.other_keys_used.title %>

@@ -127,7 +127,7 @@ jQuery('#filter').bind('change', function() { }); jQuery.getJSON('/api/2/db/keys/overview?key=#{ @key_uri }', function(data, textStatus) { - var table_content = 'Number of objectsValues'; + var table_content = '' + texts.pages.key.number_objects + '' + texts.osm.values + ''; table_content += jQuery.map(['all', 'nodes', 'ways', 'relations'], function(obj, i) { var d = data[obj]; return '' + print_image(obj) + '' + print_value_with_percent(d.count, d.count_fraction) + '' + print_with_ts(d.values) + ''; diff --git a/web/views/tag.erb b/web/views/tag.erb index 3f58adb..cb952c6 100644 --- a/web/views/tag.erb +++ b/web/views/tag.erb @@ -18,18 +18,18 @@
-

Wiki pages about this tag

+

<%= t.pages.tag.wiki_pages.title %>

-

JOSM style rules about this tag

+

<%= t.pages.key.josm_rules.title %>

- + -- cgit v1.2.3