diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/i18n/de.yml | 5 | ||||
-rw-r--r-- | web/i18n/en.yml | 5 | ||||
-rw-r--r-- | web/lib/ui/keys_tags.rb | 5 | ||||
-rw-r--r-- | web/lib/utils.rb | 6 | ||||
-rw-r--r-- | web/views/tag.erb | 2 |
5 files changed, 14 insertions, 9 deletions
diff --git a/web/i18n/de.yml b/web/i18n/de.yml index 4a6745c..bf7a8d1 100644 --- a/web/i18n/de.yml +++ b/web/i18n/de.yml @@ -129,7 +129,7 @@ pages: wiki_pages: title: Wiki-Seiten zu diesem Key none_found: Keine Wiki-Seiten für diesen Key vorhanden. - create: Wiki-Seite anlegen + create: Wiki-Seite für diesen Key anlegen josm_rules: title: JOSM-Stil-Regeln mit diesem Key choice: | @@ -146,7 +146,8 @@ pages: wiki_pages: title: Wiki-Seiten zu diesem Tag none_found: Keine Wiki-Seiten für diesen Tag vorhanden. - create: Wiki-Seite anlegen + create: Wiki-Seite für diesen Tag anlegen + suggest_key_wiki_page: Vielleicht gibt es auf der Wiki-Seite für den Key %1 mehr Informationen. josm_rules: title: JOSM-Stil-Regeln mit diesem Tag choice: | diff --git a/web/i18n/en.yml b/web/i18n/en.yml index 6e849d6..65875e2 100644 --- a/web/i18n/en.yml +++ b/web/i18n/en.yml @@ -125,7 +125,7 @@ pages: wiki_pages: title: Wiki pages about this key none_found: No wiki page available for this key. - create: Create wiki page + create: Create wiki page for this key josm_rules: title: JOSM style rules with this key choice: | @@ -142,7 +142,8 @@ pages: wiki_pages: title: Wiki pages about this tag none_found: No wiki page available for this tag. - create: Create wiki page + create: Create wiki page for this tag + suggest_key_wiki_page: Maybe you can find some more information on the wiki page for the key %1. josm_rules: title: JOSM style rules with this tag choice: | diff --git a/web/lib/ui/keys_tags.rb b/web/lib/ui/keys_tags.rb index 2782be9..f0a233d 100644 --- a/web/lib/ui/keys_tags.rb +++ b/web/lib/ui/keys_tags.rb @@ -98,7 +98,10 @@ class Taginfo < Sinatra::Base @sel = Hash.new('') @sel[@filter_type] = ' selected="selected"' - @wiki_count = @db.count('wiki.wikipages').condition('value=?', @value).condition('key=?', @key).get_first_value().to_i + @wiki_count = @db.count('wiki.wikipages').condition('key=?', @key).condition('value=?', @value).get_first_value().to_i + if @wiki_count == 0 + @wiki_count_key = @db.count('wiki.wikipages').condition('key=?', @key).condition('value IS NULL').get_first_value().to_i + end @count_all = @db.select('SELECT count_all FROM db.tags').condition('key = ? AND value = ?', @key, @value).get_first_value().to_i @desc = h(@db.select("SELECT description FROM wiki.wikipages WHERE lang=? AND key=? AND value=?", r18n.locale.code, @key, @value).get_first_value()) diff --git a/web/lib/utils.rb b/web/lib/utils.rb index 731f765..c384940 100644 --- a/web/lib/utils.rb +++ b/web/lib/utils.rb @@ -129,13 +129,13 @@ def pp_value(value) return escape_html(value).gsub(/ /, '␣').gsub(/\s/, '<span class="whitespace"> </span>') end -def link_to_key(key) +def link_to_key(key, tab='') k = escape(key) if key.match(/[=\/]/) - return '<a href="/keys/?key=' + k + '">' + pp_key(key) + '</a>' + return '<a href="/keys/?key=' + k + tab + '">' + pp_key(key) + '</a>' else - return '<a href="/keys/' + k + '">' + pp_key(key) + '</a>' + return '<a href="/keys/' + k + tab + '">' + pp_key(key) + '</a>' end end diff --git a/web/views/tag.erb b/web/views/tag.erb index 472abb7..cde0024 100644 --- a/web/views/tag.erb +++ b/web/views/tag.erb @@ -45,7 +45,7 @@ <table id="grid-wiki"> </table> <% else %> - <p class="empty"><%= t.pages.tag.wiki_pages.none_found %></p> + <p class="empty"><%= t.pages.tag.wiki_pages.none_found %> <%= @wiki_count_key > 0 ? t.pages.tag.wiki_pages.suggest_key_wiki_page(link_to_key(@key, '#wiki')) : '' %></p> <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Tag:<%= escape(@tag) %>"><%= t.pages.tag.wiki_pages.create %></a></p> <% end %> </div> |