diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index 69b8c86..7a3679a 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -1725,6 +1725,18 @@ $header-tilt: 8deg; } } +body.error-locale-not-available { + .locales { + list-style: none; + padding: 0; + text-align: center; + + li { + margin-bottom: 1em; + } + } +} + body { #primary-content { @include _(transition, 'filter 250ms ease-in-out, -webkit-filter 250ms ease-in-out'); diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bd111f9..4feb77a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -646,7 +646,9 @@ module ApplicationHelper end def language(locale, original_language = false) - _("languages.#{locale}", locale: original_language ? locale : nil) + args = {} + args[:locale] = locale if original_language + _("languages.#{locale}", args) end def date(date, format = :long) @@ -1086,13 +1088,10 @@ module ApplicationHelper new_id = id if @_ids[id] > 0 - #puts " ====== #{id} - #{@_ids[id]} : #{@_ids[id] + 1} ====== " new_id += "--#{@_ids[id]}" end - puts " ====== #{id} = #{@_ids[id]} ====== " @_ids[id] += 1 - puts " ====== #{id} = #{@_ids[id]} ====== " return new_id end diff --git a/app/views/application/locale_not_available.html.haml b/app/views/application/locale_not_available.html.haml index 67fedaf..b16f79a 100644 --- a/app/views/application/locale_not_available.html.haml +++ b/app/views/application/locale_not_available.html.haml @@ -1,4 +1,10 @@ = render :partial => 'application/header', :locals => {:image_file => 'runes.jpg'} = row do = columns(medium: 12) do - = paragraph(_'error.locale_not_available.description', :p, @main_title_vars) \ No newline at end of file + = paragraph(_'error.locale_not_available.description', :p, @main_title_vars) + %ul.locales + - @alt_lang_urls.each do |locale, url| + %li + - locale_translation = language(locale, true) + %a.button{href: url, lang: locale} + =_'translate.content.change_locale', "Read in #{locale_translation}", vars: {language: locale_translation}, locale: locale