On Thu, Aug 30, 2012 at 01:46:29PM -0400, Matt Wagner wrote:
On Thu, Aug 30, 2012 at 05:52:07PM +0100, Angus Thomas wrote:
> ---
> src/config/locales/role_definitions/en.yml | 6 +++---
> src/config/locales/strategies/en.yml | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/config/locales/role_definitions/en.yml
b/src/config/locales/role_definitions/en.yml
> index b5b0cab..2bca8bd 100644
> --- a/src/config/locales/role_definitions/en.yml
> +++ b/src/config/locales/role_definitions/en.yml
> @@ -35,10 +35,10 @@ en:
> admin: Pool Deployable Admin
> user: Pool User
> pool_family:
> - admin: Pool Family Administrator
> + admin: Environment Administrator
> image:
> - admin: Pool Family Image Administrator
> - user: Pool Family User
> + admin: Environment Image Administrator
> + user: Environment User
> provider:
> admin: Provider Administrator
> user: Provider User
> diff --git a/src/config/locales/strategies/en.yml
b/src/config/locales/strategies/en.yml
> index 33b6e79..6da95f9 100644
> --- a/src/config/locales/strategies/en.yml
> +++ b/src/config/locales/strategies/en.yml
> @@ -6,6 +6,6 @@ en:
> name: 'Penalty for Failure'
> views:
> edit:
> - penalty_percentage: 'Penalty for each failure (in percentage)'
> + penalty_percentage: Percentage penalty for each failure'
^^ ^^
So, umm, Jan pointed out that I managed to overlook a glaring error
here.
Since I'd already pushed the patch, I fixed the issue and just pushed it
-- adding in the missing quote.
ACK. I have pushed this to master, but not 1.1. (It's easy to
cherry-pick over, but I wasn't positive if it was meant to end up there,
so I figured I'd wait until tomorrow to be absolutely certain.)
If this is cherry-picked, please be sure to cherry-pick over both the
original patch and my fix (917fb27).
-- Matt