wst 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d4e39821ab781b82410d564e334910a830ea243
-  data.tar.gz: e23a8193b48e32a9011fb36fb0f3f96c8ad94c8b
+  metadata.gz: a0f996c6d749a1111382813594a907eccac09559
+  data.tar.gz: f8b0e4f25d1bca482568cce4d58adeea6badb040
 SHA512:
-  metadata.gz: 5df0d135f7cba7a499d7b5e6cb6206dd356a93a687e83839fe2d869a868c574ae139144920241f0646ce1fe6a3b6b24e549431a98ee8d97348b82d28c9f7ee01
-  data.tar.gz: f52fe27732d41d984585f8d910c0a193878460c62de4399f73b22a553c12c62fd3cbce6c31856e5efe708b81797e59c7debf4990eb4a82689146cb0cef4b5fab
+  metadata.gz: 2b84213a2e57858037a030bff6c71c2af0ec277d09f3703e9dfd3ae3bfe94ff1c6ccb2f26e20c06f40ecb2f55d2e3039a801a1a9fdec403fafed3516e21b6bd5
+  data.tar.gz: e694815ee6af8ce2df5a984aaf0b32a85e8d12db415138db071603183a8c4e3af50465454062b88346096cf1342efccc2ebfebcd99636f1515b0e00b628fcc5c

data/lib/configuration.rb

@@ -21,6 +21,7 @@ module Wst
     def self.read_config location, local
       Configuration.read_configuration location, local
       Configuration.read_default_links
+      Configuration.read_translations
     end
 
     def self.read_configuration location, local
@@ -36,6 +37,15 @@ module Wst
       @defaultLinks = if File.exists? self.links_file_path then "\n" + File.open(self.links_file_path, "r:utf-8").read else "" end
     end
 
+    def self.read_translations
+      @config['translations'] = {}
+      self.translation_files.each do |file|
+        translation = YAML.load File.open(file, 'r:utf-8').read
+        lang = File.basename file, '.yaml'
+        @config['translations'][lang] = translation
+      end
+    end
+
     def self.valid_location? location
       return false unless File.exists? File.join location, "config.yaml"
       return false unless File.directory? File.join location, "_posts"
@@ -47,5 +57,9 @@ module Wst
     def self.links_file_path
       File.join config['path'], "links.md"
     end
+
+    def self.translation_files
+      Dir.glob File.join config['path'], "_translations", "**.yaml"
+    end
   end
 end

data/lib/haml_helpers_wlt_extensions.rb

@@ -13,7 +13,11 @@ module Haml
       include Wst::Configuration
 
       def link_to name, content, ext = 'html'
-        "<a href='#{url_for(content, ext)}'>#{name}</a>"
+        "<a href='#{url(content, ext)}'>#{name}</a>"
+      end
+
+      def link_to_p name, content, ext = 'html'
+        "<a href='#{url_p(content, ext)}'>#{name}</a>"
       end
 
       #def link_to_if condition, name, content, ext = 'html'
@@ -32,16 +36,26 @@ module Haml
       #  end
       #end
 
-      def url content, ext = 'html'
-        if content.is_a? String
-          url_for_string content, ext
+      def url content, ext = 'html', prefix = false
+        url = if content.is_a? String
+          content
         else
-          url_for_string content.url, ext
+          content.url
         end
+        url_for_string url, ext, prefix
+      end
+
+      def url_p content, ext = 'html'
+        url content, ext, true
       end
 
       def render opts = {}
-        engine = Haml::Engine.new partial_haml_content(opts[:partial]).raw_content
+        content = unless opts[:partial].nil?
+          partial_haml_content(opts[:partial], false)
+        else
+          partial_haml_content(opts[:partial_p], true)
+        end
+        engine = Haml::Engine.new content.raw_content
         engine.render self
       end
 
@@ -62,21 +76,40 @@ module Haml
         end
       end
 
+      def tr key, lang = nil
+        l = if lang.nil?
+          if content.prefix?
+            content.prefix
+          else
+            'default'
+          end
+        else
+          lang
+        end
+        if config['translations'].has_key?(l) && config['translations'][l].has_key?(key)
+          config['translations'][l][key]
+        else
+          key
+        end
+      end
 
       private
 
-      def partial_path partial
-        default_path = File.join config['path'], '_layouts', "#{partial}.haml"
+      def partial_path partial, prefix
+        p = "#{partial}.haml"
+        p = File.join(content.prefix, p) if prefix && content.prefix?
+        default_path = File.join config['path'], '_layouts', p
         File.join File.dirname(default_path), "_#{File.basename(default_path)}"
       end
 
-      def partial_haml_content partial
-        Wst::HamlContent.new partial_path(partial), content
+      def partial_haml_content partial, prefix
+        Wst::HamlContent.new partial_path(partial, prefix), content
       end
 
-      def url_for_string url, ext
+      def url_for_string url, ext, prefix
         path = url
         path += ".#{ext}" if !url.empty? && File.extname(url).empty?
+        path = "#{content.prefix}/#{path}" if prefix && content.prefix?
         "#{config['site_url']}/#{path}"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wst
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Yves Brissaud