[PATCH conductor] Fix translation conflict in the footer

Imre Farkas ifarkas at redhat.com
Wed Feb 1 15:11:14 UTC 2012


On 02/01/2012 04:06 PM, tsedovic at redhat.com wrote:
> From: Tomas Sedovic<tomas at sedovic.cz>
>
> The commit 9209d5811298aae1c390d03a6c7dbf8d90f3800e introduced a "support" top
> level entry in our I18n glossary which conflicts with the entry for the
> "Support" text in Conductor's footer.
> ---
>   src/app/views/layouts/application.html.haml |    8 ++++----
>   src/config/locales/en.yml                   |   11 ++++++-----
>   2 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/src/app/views/layouts/application.html.haml b/src/app/views/layouts/application.html.haml
> index 249b19e..c5c1bf7 100644
> --- a/src/app/views/layouts/application.html.haml
> +++ b/src/app/views/layouts/application.html.haml
> @@ -59,7 +59,7 @@
>           %span.logo Aeolus
>           #legal
>             %nav.footer
> -            %a{:href =>  '#'}= t :disclaimer
> -            %a{:href =>  '#'}= t :terms_of_use
> -            %a{:href =>  '#'}= t :support
> -            %span.copyright!= t :copyright
> +            %a{:href =>  '#'}= t('layout.disclaimer')
> +            %a{:href =>  '#'}= t('layout.terms_of_use')
> +            %a{:href =>  '#'}= t('layout.support')
> +            %span.copyright!= t('layout.copyright')
> diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
> index d6258ef..d76e0ef 100644
> --- a/src/config/locales/en.yml
> +++ b/src/config/locales/en.yml
> @@ -1,9 +1,10 @@
>   en:
> -  disclaimer: Disclaimer
> -  terms_of_use: Terms of Use
> -  support: Support
> -  copyright: "Copyright&copy; 2009-2012 Red Hat, Inc. All Rights Reserved."
> -  dashboard: Dashboard
> +  layout:
> +    disclaimer: Disclaimer
> +    terms_of_use: Terms of Use
> +    support: Support
> +    copyright: "Copyright&copy; 2009-2012 Red Hat, Inc. All Rights Reserved."
> +    dashboard: Dashboard
>     datetime:
>       distance_in_words:
>         x_hours:

Sorry Tomas, I have missed that.
ACK



More information about the aeolus-devel mailing list