diff options
| -rw-r--r-- | web/i18n/de.yml | 2 | ||||
| -rw-r--r-- | web/i18n/en.yml | 2 | ||||
| -rw-r--r-- | web/i18n/fr.yml | 2 | ||||
| -rw-r--r-- | web/i18n/it.yml | 2 | ||||
| -rw-r--r-- | web/i18n/ru.yml | 2 | ||||
| -rw-r--r-- | web/lib/ui/keys_tags.rb | 2 | ||||
| -rwxr-xr-x | web/taginfo.rb | 3 | ||||
| -rw-r--r-- | web/views/about.erb | 6 | ||||
| -rw-r--r-- | web/views/index.erb | 4 | ||||
| -rw-r--r-- | web/views/layout.erb | 4 |
10 files changed, 8 insertions, 21 deletions
diff --git a/web/i18n/de.yml b/web/i18n/de.yml index 6d90115..6479f59 100644 --- a/web/i18n/de.yml +++ b/web/i18n/de.yml @@ -24,8 +24,6 @@ taginfo: wiki: Wiki report: Report reports: Reports - keys: Keys - tags: Tags international: International apidoc: API-Dokumenatation test: Test diff --git a/web/i18n/en.yml b/web/i18n/en.yml index e806eef..f79867e 100644 --- a/web/i18n/en.yml +++ b/web/i18n/en.yml @@ -25,8 +25,6 @@ taginfo: wiki: taginfo wiki page report: Report reports: Reports - keys: Keys - tags: Tags international: International apidoc: API Documentation test: Test diff --git a/web/i18n/fr.yml b/web/i18n/fr.yml index 12bf714..f807f5f 100644 --- a/web/i18n/fr.yml +++ b/web/i18n/fr.yml @@ -22,8 +22,6 @@ taginfo: about: À Propos de Taginfo wiki: Wiki reports: Compte-Rendus - keys: Clés - tags: Tags map: Carte maps: Cartes key_combinations: Combinaisons diff --git a/web/i18n/it.yml b/web/i18n/it.yml index 4606f67..17d51ee 100644 --- a/web/i18n/it.yml +++ b/web/i18n/it.yml @@ -23,8 +23,6 @@ taginfo: wiki: Wiki report: Report reports: Reports - keys: Chiavi - tags: Tags map: Mappa maps: Mappe key_combinations: Combinazioni diff --git a/web/i18n/ru.yml b/web/i18n/ru.yml index 4f9147f..3736bb0 100644 --- a/web/i18n/ru.yml +++ b/web/i18n/ru.yml @@ -22,8 +22,6 @@ taginfo: about: Про Taginfo wiki: Вики reports: Отчёты - keys: Ключи - tags: Теги map: Карта maps: Карты key_combinations: Сочетания diff --git a/web/lib/ui/keys_tags.rb b/web/lib/ui/keys_tags.rb index 4d53e85..97573b3 100644 --- a/web/lib/ui/keys_tags.rb +++ b/web/lib/ui/keys_tags.rb @@ -87,7 +87,7 @@ class Taginfo < Sinatra::Base @value_json = @value.to_json @value_pp = pp_value(@value) - @title = [@key_html + '=' + @value_html, t.taginfo.tags] + @title = [@key_html + '=' + @value_html, t.osm.tags] section :tags @filter_type = get_filter() diff --git a/web/taginfo.rb b/web/taginfo.rb index f31c93c..255e7d0 100755 --- a/web/taginfo.rb +++ b/web/taginfo.rb @@ -182,9 +182,6 @@ class Taginfo < Sinatra::Base :nomsg => trans.t.flexigrid.nomsg, :errormsg => trans.t.flexigrid.errormsg, }, - :instance_description => { - :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, diff --git a/web/views/about.erb b/web/views/about.erb index 09a395c..ac5fa09 100644 --- a/web/views/about.erb +++ b/web/views/about.erb @@ -62,10 +62,10 @@ <p>If you want to play around with the data itself, you can <b>download</b> the regularly updated databases used by taginfo. All the preprocessing is done for - you. See the <a href="/download">download</a> section for more information.</p> + you. See the <a href="/download">download page</a> for more information.</p> - <p>Taginfo data can also be accessed through a REST <b>API</b>. The documentation of the - API calls is <a href="/apidoc">here</a>, some general information is + <p>Taginfo data can also be accessed through a REST <b>API</b>. See the + <a href="/apidoc">API call documentation</a> for the details, some general information is <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/API">on the wiki</a>. The server running the Taginfo API does not have unlimited resources. Please use the API responsibly. If in doubt contact the taginfo maintainers.</p> diff --git a/web/views/index.erb b/web/views/index.erb index 692e46c..bc76ed7 100644 --- a/web/views/index.erb +++ b/web/views/index.erb @@ -1,8 +1,8 @@ <table class="boxes resize" width="100%"> <tr> <td> - <h2><a href="/keys"><%= t.taginfo.keys %></a> - / <a href="/tags"><%= t.taginfo.tags %></a></h2> + <h2><a href="/keys"><%= t.osm.keys %></a> + / <a href="/tags"><%= t.osm.tags %></a></h2> </td> <td rowspan="4" width="20"></td> <td width="232"> diff --git a/web/views/layout.erb b/web/views/layout.erb index 7e6823f..050b673 100644 --- a/web/views/layout.erb +++ b/web/views/layout.erb @@ -46,8 +46,8 @@ <a class="extlink" href="http://www.openstreetmap.org/"><b>OpenStreetMap</b> - The Free Wiki World Map</a> </div> <div id="footer_right"> - <a href="/keys"><%= t.taginfo.keys %></a> · - <a href="/tags"><%= t.taginfo.tags %></a> · + <a href="/keys"><%= t.osm.keys %></a> · + <a href="/tags"><%= t.osm.tags %></a> · <a href="/reports"><%= t.taginfo.reports %></a> · <a href="/sources"><%= t.taginfo.sources %></a> · <a href="/download"><%= t.taginfo.download %></a> · |