Merge pull request #335

78b2eab Translatable strings for simplewallet (moneromooo-monero)

src/common/CMakeLists.txt

@@ -30,7 +30,8 @@ set(common_sources
   base58.cpp
   command_line.cpp
   dns_utils.cpp
-  util.cpp)
+  util.cpp
+  i18n.cpp)
 
 set(common_headers)
 
@@ -46,7 +47,8 @@ set(common_private_headers
   scoped_message_writer.h
   unordered_containers_boost_serialization.h
   util.h
-  varint.h)
+  varint.h
+  i18n.h)
 
 bitmonero_private_headers(common
   ${common_private_headers})

src/common/i18n.h

@@ -0,0 +1,36 @@
+// Copyright (c) 2014-2015, The Monero Project
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+// 
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+// 
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+// 
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#pragma once
+
+#define QT_TRANSLATE_NOOP(context,str) i18n_translate(str,context)
+
+int i18n_set_language(const char *directory, const char *base);
+const char *i18n_translate(const char *str, const std::string &context);
+static inline std::string get_default_i18n_context() { return std::string(); }
+static inline const char *tr(const char *str) { return i18n_translate(str,get_default_i18n_context()); }

src/simplewallet/simplewallet.h

@@ -57,6 +57,9 @@ namespace cryptonote
    */
   class simple_wallet : public tools::i_wallet2_callback
   {
+  public:
+    static const char *tr(const char *str) { return i18n_translate(str, "cryptonote::simple_wallet"); }
+
   public:
     typedef std::vector<std::string> command_type;
 
@@ -165,7 +168,7 @@ namespace cryptonote
 
         if (std::chrono::milliseconds(1) < current_time - m_print_time || force)
         {
-          std::cout << "Height " << height << " of " << m_blockchain_height << '\r';
+          std::cout << QT_TRANSLATE_NOOP("Height ", "cryptonote::simple_wallet") << height << " / " << m_blockchain_height << '\r';
           m_print_time = current_time;
         }
       }