[PATCH conductor] BZ761132 fix broken translations for template xml

[Tomas Sedovic]

From: Tomas Sedovic

https://bugzilla.redhat.com/show_bug.cgi?id=761132
---
 src/app/controllers/images_controller.rb |    2 +-
 src/app/models/template_xml.rb           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb
index 7c99906..a178596 100644
--- a/src/app/controllers/images_controller.rb
+++ b/src/app/controllers/images_controller.rb
@@ -103,7 +103,7 @@ class ImagesController < ApplicationController
       begin
         xml_source = RestClient.get(url, :accept => :xml)
       rescue RestClient::Exception, SocketError, URI::InvalidURIError
-        flash.now[:error] = t('template_xml.flash.error.invalid_url')
+        flash.now[:error] = t('images.flash.error.invalid_url')
         render :new and return
       end
     else
diff --git a/src/app/models/template_xml.rb b/src/app/models/template_xml.rb
index c58b5cb..149c9c5 100644
--- a/src/app/models/template_xml.rb
+++ b/src/app/models/template_xml.rb
@@ -39,7 +39,7 @@ class TemplateXML
     begin
       doc = TemplateXML.new(xmlstr)
     rescue Nokogiri::XML::SyntaxError
-      return [I18n.t('template_xml.errors.xml_parser_error')]
+      return [I18n.t('template_xml.errors.xml_parse_error')]
     end
     return doc.validate
   end

[Tomas Sedovic]

On 12/08/2011 03:29 PM, [e-mail] wrote:
> From: Tomas Sedovic
> https://bugzilla.redhat.com/show_bug.cgi?id=761132
>
> src/app/controllers/images_controller.rb |    2 +-
>   src/app/models/template_xml.rb           |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb
> index 7c99906..a178596 100644
> --- a/src/app/controllers/images_controller.rb
> +++ b/src/app/controllers/images_controller.rb
> @@ -103,7 +103,7 @@ class ImagesController<  ApplicationController
>         begin
>           xml_source = RestClient.get(url, :accept =>  :xml)
>         rescue RestClient::Exception, SocketError, URI::InvalidURIError
>    flash.now[:error] = t('template_xml.flash.error.invalid_url')
>    flash.now[:error] = t('images.flash.error.invalid_url')
>     render :new and return
>   end
> else
>
> diff --git a/src/app/models/template_xml.rb b/src/app/models/template_xml.rb
> index c58b5cb..149c9c5 100644
> --- a/src/app/models/template_xml.rb
> +++ b/src/app/models/template_xml.rb
> @@ -39,7 +39,7 @@ class TemplateXML
>       begin
>         doc = TemplateXML.new(xmlstr)
>       rescue Nokogiri::XML::SyntaxError
>  return [I18n.t('template_xml.errors.xml_parser_error')]
>  return [I18n.t('template_xml.errors.xml_parse_error')]
> end
> return doc.validate
> end

Self-ack & pushed