- removed the message type attribute

- madte the message text attribute translatable

diff --git a/zypp/Message.cc b/zypp/Message.cc
index dfdd96da15f36bd8664dbbe6640c882625bfd4ac..02f5b8473ea4607605e8c9e5735b3993c859e6e8 100644 (file)
--- a/zypp/Message.cc
+++ b/zypp/Message.cc
@@ -40,12 +40,9 @@ namespace zypp
   //
   ///////////////////////////////////////////////////////////////////
 
-  std::string Message::text() const
+  TranslatedText Message::text() const
   { return pimpl().text(); }
 
-  std::string Message::type() const
-  { return pimpl().type(); }
-
   /////////////////////////////////////////////////////////////////
 } // namespace zypp
 ///////////////////////////////////////////////////////////////////

diff --git a/zypp/Message.h b/zypp/Message.h
index 570b600b5750a2e29a4aad5ff03a60e3e6bcb304..3391d4f607c79c750cf6d461a7c71dc48ea8ecae 100644 (file)
--- a/zypp/Message.h
+++ b/zypp/Message.h
@@ -36,9 +36,7 @@ namespace zypp
 
   public:
     /** Get the text of the message */
-    std::string text() const;
-    /** Get the type of the message (YesNo / OK) */
-    std::string type() const;
+    TranslatedText text() const;
 
   protected:
     Message( const NVRAD & nvrad_r );

diff --git a/zypp/detail/MessageImpl.cc b/zypp/detail/MessageImpl.cc
index 8c535876ea32e6f85e7ca83cb46df9ac70300feb..c56a82f6b794fa3c8c6c2b9e062f60c695ddc828 100644 (file)
--- a/zypp/detail/MessageImpl.cc
+++ b/zypp/detail/MessageImpl.cc
@@ -34,11 +34,7 @@ namespace zypp
     MessageImpl::~MessageImpl()
     {}
 
-    std::string MessageImpl::type() const {
-      return _type;
-    }
-
-    std::string MessageImpl::text() const {
+    TranslatedText MessageImpl::text() const {
       return _text;
     }
 

diff --git a/zypp/detail/MessageImpl.h b/zypp/detail/MessageImpl.h
index aa48659864cffe30d09d93bd42875da0c22b12bc..43fbd0a9fc5eddf3315f0ecff341c4726c26e645 100644 (file)
--- a/zypp/detail/MessageImpl.h
+++ b/zypp/detail/MessageImpl.h
@@ -36,14 +36,10 @@ namespace zypp
 
     public:
       /** Get the text of the message */
-      virtual std::string text() const;
-      /** Get the type of the message (YesNo / OK) */
-      virtual std::string type() const;
+      virtual TranslatedText text() const;
     protected:
       /** The text of the message */
-      std::string _text;
-      /** The type of the message (YesNo / OK) */
-      std::string _type;
+      TranslatedText _text;
     };
     ///////////////////////////////////////////////////////////////////
 

diff --git a/zypp/detail/MessageImplIf.h b/zypp/detail/MessageImplIf.h
index fc660ae9a142139b8c4f0acfaf82fa0084c1c59f..5e2917fe6c44d7a9c1d2cbc67463651c9bb515af 100644 (file)
--- a/zypp/detail/MessageImplIf.h
+++ b/zypp/detail/MessageImplIf.h
@@ -37,9 +37,7 @@ namespace zypp
 
     public:
       /** Get the text of the message */
-      virtual std::string text() const = 0;
-      /** Get the type of the message (YesNo / OK) */
-      virtual std::string type() const = 0;
+      virtual TranslatedText text() const = 0;
       /** */
       virtual ByteCount size() const;
     };

diff --git a/zypp/parser/yum/YUMParserData.cc b/zypp/parser/yum/YUMParserData.cc
index 5e7fa95ae3c0f19602962c41eacfd22c3d5efefe..6fe23467c1c4641ec3ef4f6e6b93421cb87d7be8 100644 (file)
--- a/zypp/parser/yum/YUMParserData.cc
+++ b/zypp/parser/yum/YUMParserData.cc
@@ -439,7 +439,6 @@ namespace zypp {
       {
         out << "Message Data: " << endl
           << "  name: " << data.name << endl
-          << "  type: " << data.type << endl
           << "  epoch: " << data.epoch << endl
           << "  version: " << data.ver << endl
           << "  release: " << data.rel << endl

diff --git a/zypp/parser/yum/YUMParserData.h b/zypp/parser/yum/YUMParserData.h
index 9e3a008ab4fc22a558574117e943564e5b67b268..63ad45b5e46ae0132200f412aa1b2a1945f3d18b 100644 (file)
--- a/zypp/parser/yum/YUMParserData.h
+++ b/zypp/parser/yum/YUMParserData.h
@@ -262,8 +262,7 @@ namespace zypp {
       public:
         YUMPatchMessage() {};
         virtual AtomType atomType() { return Message; };
-        std::string type;
-        std::string text;
+        TranslatedText text;
       };
 
 

diff --git a/zypp/parser/yum/YUMPatchParser.cc b/zypp/parser/yum/YUMPatchParser.cc
index 2f6950f9ea192baf7b44851c8daefca0f30ed130..5fdc73210a2a7d6b3ff741754dedfcbc533a0f9d 100644 (file)
--- a/zypp/parser/yum/YUMPatchParser.cc
+++ b/zypp/parser/yum/YUMPatchParser.cc
@@ -494,7 +494,6 @@ namespace zypp {
                                      xmlNodePtr formatNode)
       {
        shared_ptr<YUMPatchMessage> message(new YUMPatchMessage);
-        message->type = _helper.attribute(formatNode,"type");
       
         // FIXME move the respective method to a common class, inherit it  
         YUMPrimaryParser prim;
@@ -505,7 +504,7 @@ namespace zypp {
           if (_helper.isElement(child)) {
             string name = _helper.name(child);
             if (name == "name") {
-       message->name = _helper.content(child);
+             message->name = _helper.content(child);
             }
             else if (name == "version") {
               message->epoch = _helper.attribute(child,"epoch");
@@ -513,7 +512,7 @@ namespace zypp {
               message->rel = _helper.attribute(child,"rel");
             }
             else if (name == "text") {
-       message->text = _helper.content(child);
+             message->text.setText(_helper.content(child), Locale(_helper.attribute(child,"lang")));
             }
             else if (name == "provides") {
               prim.parseDependencyEntries(& message->provides, child);

diff --git a/zypp/parser/yum/schema/patch.rnc b/zypp/parser/yum/schema/patch.rnc
index 20c3b7005062c93c16e0ad0788adbcdfd4f5451d..42e4cb348134c0a17a5b63a9ecb5a82735b7b758 100644 (file)
--- a/zypp/parser/yum/schema/patch.rnc
+++ b/zypp/parser/yum/schema/patch.rnc
@@ -62,8 +62,7 @@ element-message =
   element message {
     element-name,
     element-version,    
-    attribute type { "OK" | "YesNo" },
-    element text { xsd:string },
+    element text { localized-string }+,
     dependency-block
   }
 

diff --git a/zypp/parser/yum/schema/patch.rng b/zypp/parser/yum/schema/patch.rng
index 4813c475299426a6c7f40878b7053a735b95f346..f02493935accbb1c22f54b16ebdf88d6d0c15536 100644 (file)
--- a/zypp/parser/yum/schema/patch.rng
+++ b/zypp/parser/yum/schema/patch.rng
@@ -141,15 +141,11 @@
     <element name="message">
       <ref name="element-name"/>
       <ref name="element-version"/>
-      <attribute name="type">
-        <choice>
-          <value>OK</value>
-          <value>YesNo</value>
-        </choice>
-      </attribute>
-      <element name="text">
-        <data type="string"/>
-      </element>
+      <oneOrMore>
+        <element name="text">
+          <ref name="localized-string"/>
+        </element>
+      </oneOrMore>
       <ref name="dependency-block"/>
     </element>
   </define>

diff --git a/zypp/source/yum/YUMMessageImpl.cc b/zypp/source/yum/YUMMessageImpl.cc
index f9243f687f3adcc592fff9d2bec66a679cbd7457..a98ea30c249b841ff2bd04369ddb819c63e81b5b 100644 (file)
--- a/zypp/source/yum/YUMMessageImpl.cc
+++ b/zypp/source/yum/YUMMessageImpl.cc
@@ -38,16 +38,11 @@ namespace zypp
       : _source(source_r)
       {
        _text = parsed.text;
-       _type = parsed.type;
       }
       /** Get the text of the message */
-      std::string YUMMessageImpl::text() const {
+      TranslatedText YUMMessageImpl::text() const {
        return _text;
       }
-      /** Get the type of the message (YesNo / OK) */
-      std::string YUMMessageImpl::type() const {
-       return _type;
-      }
       TranslatedText YUMMessageImpl::summary() const
       { return ResObjectImplIf::summary(); }
 

diff --git a/zypp/source/yum/YUMMessageImpl.h b/zypp/source/yum/YUMMessageImpl.h
index e3e79ba713c6adc9f989f9b54e7ec17c02835847..9089234ea3a39bcc91f30abe61883e73764c1631 100644 (file)
--- a/zypp/source/yum/YUMMessageImpl.h
+++ b/zypp/source/yum/YUMMessageImpl.h
@@ -40,9 +40,7 @@ namespace zypp
          const zypp::parser::yum::YUMPatchMessage & parsed
        );
        /** Get the text of the message */
-       virtual std::string text() const;
-       /** Get the type of the message (YesNo / OK) */
-       virtual std::string type() const;
+       virtual TranslatedText text() const;
        /** */
        virtual TranslatedText summary() const;
        /** */
@@ -61,9 +59,7 @@ namespace zypp
 
       protected:
        /** The text of the message */
-       std::string _text;
-       /** The type of the message (YesNo / OK) */
-       std::string _type;
+       TranslatedText _text;
       private:
        Source_Ref _source;
       public:

diff --git a/zypp/target/store/XMLFilesBackend.cc b/zypp/target/store/XMLFilesBackend.cc
index 1f8da27a45546e4cdf24dd60d906e5f9c8f6d8cc..23ba4e2897f94d288c7169ef4f64cfdefa0800f4 100644 (file)
--- a/zypp/target/store/XMLFilesBackend.cc
+++ b/zypp/target/store/XMLFilesBackend.cc
@@ -412,7 +412,6 @@ XMLFilesBackend::createMessage( const zypp::parser::yum::YUMPatchMessage & parse
   try
   {
     shared_ptr<XMLMessageImpl> impl(new XMLMessageImpl());
-    impl->_type = parsed.type;
     impl->_text = parsed.text;
 
     // Collect basic Resolvable data

diff --git a/zypp/target/store/serialize.cc b/zypp/target/store/serialize.cc
index 96c110428aff43f741bd73f175e4ec8b092a967a..7af630bdd66774beed2826db656614120a70cdf9 100644 (file)
--- a/zypp/target/store/serialize.cc
+++ b/zypp/target/store/serialize.cc
@@ -166,7 +166,7 @@ template<> // or constPtr?
 std::string toXML( const Message::constPtr &obj )
 {
   stringstream out;
-  out << "<message type=\"" << obj->type() << "\">" << std::endl;
+  out << "<message>" << std::endl;
   // reuse Resolvable information serialize function
   out << toXML(static_cast<Resolvable::constPtr>(obj));
   out << "  <text>" << obj->text() << "</text>" << std::endl;

diff --git a/zypp/target/store/xml/XMLMessageImpl.cc b/zypp/target/store/xml/XMLMessageImpl.cc
index 75f6d98847c3307aaaae4914a5a0a036abc68d6a..6f13549b955cd0305d071c0d9dfbda679cd06e1a 100644 (file)
--- a/zypp/target/store/xml/XMLMessageImpl.cc
+++ b/zypp/target/store/xml/XMLMessageImpl.cc
@@ -34,11 +34,7 @@ namespace zypp
     XMLMessageImpl::~XMLMessageImpl()
     {}
 
-    std::string XMLMessageImpl::type() const {
-      return _type;
-    }
-
-    std::string XMLMessageImpl::text() const {
+    TranslatedText XMLMessageImpl::text() const {
       return _text;
     }
 

diff --git a/zypp/target/store/xml/XMLMessageImpl.h b/zypp/target/store/xml/XMLMessageImpl.h
index db66b2db21bb7013932ead760b8062613481f7eb..f518ee796128bec2193a56073f2f621c4cde1c4c 100644 (file)
--- a/zypp/target/store/xml/XMLMessageImpl.h
+++ b/zypp/target/store/xml/XMLMessageImpl.h
@@ -35,14 +35,10 @@ namespace zypp
       virtual ~XMLMessageImpl();
 
       /** Get the text of the message */
-      virtual std::string text() const;
-      /** Get the type of the message (YesNo / OK) */
-      virtual std::string type() const;
+      virtual TranslatedText text() const;
     
       /** The text of the message */
-      std::string _text;
-      /** The type of the message (YesNo / OK) */
-      std::string _type;
+      TranslatedText _text;
     };
     ///////////////////////////////////////////////////////////////////