[PATCH conductor] Fixed non i18n string in catalogs#new/edit form.

Matt Wagner matt.wagner at redhat.com
Tue Feb 7 19:29:46 UTC 2012


On Tue, Feb 07, 2012 at 02:15:18PM -0500, Matt Wagner wrote:
> On Tue, Feb 07, 2012 at 06:08:33PM +0100, jzigmund at redhat.com wrote:
> > From: Jozef Zigmund <jzigmund at redhat.com>
> > 
> > ---
> >  src/app/views/catalogs/_form.html.haml |    2 +-
> >  src/config/locales/en.yml              |    2 ++
> >  2 files changed, 3 insertions(+), 1 deletions(-)
> > 
> > diff --git a/src/app/views/catalogs/_form.html.haml b/src/app/views/catalogs/_form.html.haml
> > index a1f91e7..34122d6 100644
> > --- a/src/app/views/catalogs/_form.html.haml
> > +++ b/src/app/views/catalogs/_form.html.haml
> > @@ -6,7 +6,7 @@
> >      = form.text_field :name, :class => 'em long'
> >    %p
> >      = form.label :pool_id, t('pools.pool')
> > -    = form.select(:pool_id, @pools.collect{|p| [p.name, p.id]}, :prompt => "Select pool")
> > +    = form.select(:pool_id, @pools.collect{|p| [p.name, p.id]}, :prompt =>  t("catalogs.form.select_pool"))
> >  
> >  %fieldset.options
> >    = link_to t('cancel'), catalogs_path, :class => 'button danger'
> > diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
> > index 7b809fb..048047b 100644
> > --- a/src/config/locales/en.yml
> > +++ b/src/config/locales/en.yml
> > @@ -669,6 +669,8 @@ en:
> >      edit:
> >        edit_catalog: Editing Catalog
> >        cancel_editing: Cancel Editing
> > +    form:
> > +      select_pool: Select Pool
> >      flash:
> >        notice:
> >          updated:
> > -- 
> > 1.7.7.6
> 
> ACK, nice catch. I did not push this because I worry about causing a
> conflict with another patch for Cloud Engine, but the patch is good, so
> ACK.

To make a liar of myself, after discussing this on IRC a bit, I went
ahead and pushed it to the staging repo.

-- Matt



More information about the aeolus-devel mailing list