[PATCH conductor 1/2] BZ798555 added default translations from rails-i18n gem which should be used in later versions

Tzu-Mainn Chen tzumainn at redhat.com
Tue Mar 6 20:44:03 UTC 2012


It also fails to apply for me, although with a different error:

[tzumainn at localhost src]$ git apply patches/798555.patch 
src/patches/798555.patch:41: trailing whitespace.
    - 
src/patches/798555.patch:67: trailing whitespace.
    - 
src/patches/798555.patch:252: trailing whitespace.
    - 
src/patches/798555.patch:278: trailing whitespace.
    - 
src/patches/798555.patch:465: trailing whitespace.
    - 
error: patch failed: src/config/locales/en.yml:8
error: src/config/locales/en.yml: patch does not apply


Mainn

----- Original Message -----
From: "Matt Wagner" <matt.wagner at redhat.com>
To: jtomasek at redhat.com
Cc: aeolus-devel at lists.fedorahosted.org
Sent: Tuesday, March 6, 2012 3:15:44 PM
Subject: Re: [PATCH conductor 1/2] BZ798555 added default translations from	rails-i18n gem which should be used in later versions

On Tue, Mar 06, 2012 at 05:28:36PM +0100, jtomasek at redhat.com wrote:
> From: Jiri Tomasek <jtomasek at redhat.com>
> 
> ---
>  src/app/views/layouts/_error_messages.html.haml |    2 +-
>  src/config/locales/defaults/en.yml              |  205 ++++++++++++++++++++++
>  src/config/locales/defaults/fr.yml              |  207 +++++++++++++++++++++++
>  src/config/locales/defaults/ja.yml              |  197 +++++++++++++++++++++
>  src/config/locales/en.yml                       |   22 +--
>  5 files changed, 615 insertions(+), 18 deletions(-)
>  create mode 100644 src/config/locales/defaults/en.yml
>  create mode 100644 src/config/locales/defaults/fr.yml
>  create mode 100644 src/config/locales/defaults/ja.yml

Is anyone able to apply this patch? When I try, git-am gives me the
following, nonsensical error message:

"fatal: cannot convert from yes to UTF-8"

Google is not helpful in figuring out what in the world an encoding of
"yes" means, or how it's not already UTF-8.

-- Matt



More information about the aeolus-devel mailing list