On 19/10/11 22:13 +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/10 revise all flash messages, in en.yml file w/ this structure:
flash:
error:
foo: Foo
notice:
bar: Bar
warning:
notice: not all, exclude app_controller
- added new revised views
_______________________________________________
aeolus-devel mailing list
aeolus-devel(a)lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/aeolus-devel :/ only the first patch
applies, the second and third conflict.
After you git fetch;git rebase origin/master and they succeed. Are you creating the
patches, are you resetting to master head and applying your generated patches? Maybe my
local config is screwy, but they don't apply for me. anyone else want to confirm?