[PATCH conductor] bug 800511: update overrides/en.yml for role changes
Maros Zatko
mzatko at redhat.com
Mon Mar 12 16:51:20 UTC 2012
On 03/12/2012 03:06 PM, Scott Seago wrote:
> http://bugzilla.redhat.com/show_bug.cgi?id=800511
>
> This change only includes overrides removal, so no new translation is needed for overrides.
>
> However we do need translations for a couple new entries in config/locales/role_definitions/en.yml
> The github/master change there includes this new bit needed for translation:
>
> role_defs:
> base:
> admin: Global Administrator
> - catalog:
> - user: Global Catalog User
> deployable:
> admin: Global Deployable Administrator
> - user: Global Deployable User
> hwp:
> admin: Global HWP Administrator
> user: Global HWP User
>
> admin: Global Image Administrator
> pool:
> admin: Global Pool Administrator
> - creator: Global Pool Creator
> user: Global Pool User
> provider:
> admin: Global Provider Administrator
> - creator: Global Provider Creator
> + user: Global Provider User
> realm:
> admin: Global Realm Administrator
> catalog:
>
> user: Pool Family User
> provider:
> admin: Provider Administrator
> + user: Provider User
> provider_account:
> owner: Provider Account Owner
> user: Provider Account User
>
> So we need translations for base.provider.user and provider.user
> ---
> .../locales/overrides/role_definitions/en.yml | 2 --
> src/config/locales/role_definitions/en.yml | 7 ++-----
> 2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/src/config/locales/overrides/role_definitions/en.yml b/src/config/locales/overrides/role_definitions/en.yml
> index 6b98ef0..c5c611d 100644
> --- a/src/config/locales/overrides/role_definitions/en.yml
> +++ b/src/config/locales/overrides/role_definitions/en.yml
> @@ -9,13 +9,11 @@ en:
> user: Global Profile User
> pool:
> admin: Global Zone Administrator
> - creator: Global Zone Creator
> user: Global Zone User
> realm:
> admin: Global Cluster Administrator
> deployable:
> owner: Application Blueprint Owner
> - user: Application Blueprint User
> deployment:
> owner: Application Owner
> user: Application User
> diff --git a/src/config/locales/role_definitions/en.yml b/src/config/locales/role_definitions/en.yml
> index 8563db6..b5b0cab 100644
> --- a/src/config/locales/role_definitions/en.yml
> +++ b/src/config/locales/role_definitions/en.yml
> @@ -2,11 +2,8 @@ en:
> role_defs:
> base:
> admin: Global Administrator
> - catalog:
> - user: Global Catalog User
> deployable:
> admin: Global Deployable Administrator
> - user: Global Deployable User
> hwp:
> admin: Global HWP Administrator
> user: Global HWP User
> @@ -14,11 +11,10 @@ en:
> admin: Global Image Administrator
> pool:
> admin: Global Pool Administrator
> - creator: Global Pool Creator
> user: Global Pool User
> provider:
> admin: Global Provider Administrator
> - creator: Global Provider Creator
> + user: Global Provider User
> realm:
> admin: Global Realm Administrator
> catalog:
> @@ -45,6 +41,7 @@ en:
> user: Pool Family User
> provider:
> admin: Provider Administrator
> + user: Provider User
> provider_account:
> owner: Provider Account Owner
> user: Provider Account User
is it supposed to followup some other patch? it doesn't apply properly.
More information about the aeolus-devel
mailing list