On 19/10/11 16:09 +0200, jzigmund(a)redhat.com wrote:
Changes in patchset:
- added method set_locale in app_controller(according to Matt's patch ([PATCH]
Application controller detects locale from ACCEPT_LANGUAGE header).
- revise all strings in "Monitor section" to be ready to translate
- added cs.yml file for demonstration i18n in "Monitor section" (notice: Czech
words in that file aren't real, I generated them via script w/ random strings)
- patch 2/8 revise all flash messages, in en.yml file w/ this structure:
flash:
error:
foo: Foo
notice:
bar: Bar
warning:
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel The first patch in the set
doesn't apply for me
Applying: Added method for setting locales in app controller and prepared demostration
page (Monitor section - pools#index in pretty or filter view)
error: patch failed: src/app/views/pools/_pretty_list.html.haml:28
error: src/app/views/pools/_pretty_list.html.haml: patch does not apply
error: patch failed: src/config/locales/en.yml:102
error: src/config/locales/en.yml: patch does not apply
Patch failed at 0001 Added method for setting locales in app controller and prepared
demostration page (Monitor section - pools#index in pretty or filter view)
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".