fix #490 - translate string before markup

Apipie · Oct 13, 2016 · dd67873 · dd67873
1 parent 3c64ed7
commit dd67873
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/apipie/apipie_module.rb b/lib/apipie/apipie_module.rb
@@ -31,14 +31,16 @@ def self.debug(message)
   end
 
   # get application description for given or default version
-  def self.app_info(version = nil)
-    if app_info_version_valid? version
-      Apipie.markup_to_html(self.configuration.app_info[version])
+  def self.app_info(version = nil, lang = nil)
+    info = if app_info_version_valid? version
+      translate(self.configuration.app_info[version], lang)
     elsif app_info_version_valid? Apipie.configuration.default_version
-      Apipie.markup_to_html(self.configuration.app_info[Apipie.configuration.default_version])
+      translate(self.configuration.app_info[Apipie.configuration.default_version], lang)
     else
       "Another API description"
     end
+
+    Apipie.markup_to_html info
   end
 
   def self.api_base_url(version = nil)

diff --git a/lib/apipie/application.rb b/lib/apipie/application.rb
@@ -278,7 +278,7 @@ def to_json(version, resource_name, method_name, lang)
       {
         :docs => {
           :name => Apipie.configuration.app_name,
-          :info => translate(Apipie.app_info(version), lang),
+          :info => Apipie.app_info(version, lang),
           :copyright => Apipie.configuration.copyright,
           :doc_url => Apipie.full_url(url_args),
           :api_url => Apipie.api_base_url(version),