bobot 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae9db4bc7fd7ae54fd69408599fbf4261780448dc0a076fa0754a21e5615cab
-  data.tar.gz: 8efa7ea26c009768b539f57f54b7cf2b48d753e7e2e5bba03ef7288e876c739b
+  metadata.gz: 8bcdcfe9c793c901a6e5a93db7f21076bc2e878c9b5b4e953c5ea7e7d8cc28fc
+  data.tar.gz: '013236480a0426eb37567665fa8e4fde64824908e567d5932aa0056884ccd8ce'
 SHA512:
-  metadata.gz: '090dff569f92cc356253b2dfd089aeae069c277354c0778fc943118f715751267c80a784cf6b42ba713a5369fcc11d9f8e790ca7e78a35303df2c71c870f9d84'
-  data.tar.gz: a9a021876f27cc7b6e8f96e5ddd012ce023f55826aafc37796f14b5c87df2114e6eedbd9d7b57d61053ba887f093605725680208d820258f650e140da942d328
+  metadata.gz: af170c826e5e8fe936fb49979e3b091de59089dfa35a3bae102f538d3a8fe1abd184c27ce738f0f850d32e92424bb72d6e40cf6b2430f0ff38276adf4229b1eb
+  data.tar.gz: 03c676d71f1e547dd314378de74b01a3ee0ad255e125bb5d1049007454ea203f28af7a26e473a49fcb84cb5003b9f0b77fd8022011e81c89260253c7dc1883da

data/lib/bobot/page.rb

@@ -318,7 +318,9 @@ module Bobot
       greeting_texts = []
       if self.language.nil?
         # Default text
+        short_slug = slug.gsub(/_\w+$/, "")
         greeting_text = I18n.t("bobot.#{slug}.config.greeting_text", locale: I18n.default_locale, default: nil)
+        greeting_text = I18n.t("bobot.#{short_slug}.config.greeting_text", locale: I18n.default_locale, default: nil) if greeting_text.nil?
         greeting_texts << { locale: 'default', text: greeting_text } if greeting_text.present?
         # Each languages
         I18n.available_locales.each do |locale|
@@ -330,7 +332,9 @@ module Bobot
           end
         end
       else
+        short_slug = slug.gsub(/_#{language}$/, "")
         greeting_text = I18n.t("bobot.#{slug}.config.greeting_text", locale: language, default: nil)
+        greeting_text = I18n.t("bobot.#{short_slug}.config.greeting_text", locale: language, default: nil) if greeting_text.nil?
         greeting_texts << { locale: 'default', text: greeting_text } if greeting_text.present?
       end
       if greeting_texts.present?
@@ -423,7 +427,9 @@ module Bobot
       persistent_menus = []
       # Default text
       if language.nil?
+        short_slug = slug.gsub(/_\w+$/, "")
         persistent_menu = I18n.t("bobot.#{slug}.config.persistent_menu", locale: I18n.default_locale, default: nil)
+        persistent_menu = I18n.t("bobot.#{short_slug}.config.persistent_menu", locale: I18n.default_locale, default: nil) if persistent_menu.nil?
         if persistent_menu.present?
           persistent_menus << {
             locale: 'default',
@@ -434,7 +440,9 @@ module Bobot
         # Each languages
         I18n.available_locales.each do |locale|
           persistent_menu = I18n.t("bobot.#{slug}.config.persistent_menu", locale: locale, default: nil)
+          persistent_menu = I18n.t("bobot.#{short_slug}.config.persistent_menu", locale: locale, default: nil) if persistent_menu.nil?
           facebook_locales = I18n.t("bobot.#{slug}.config.facebook_locales", locale: locale, default: nil)
+          facebook_locales = I18n.t("bobot.#{short_slug}.config.facebook_locales", locale: locale, default: nil) if facebook_locales.nil?
           next unless persistent_menu.present?
           facebook_locales.to_a.each do |locale_long|
             persistent_menus << {
@@ -445,7 +453,9 @@ module Bobot
           end
         end
       else
+        short_slug = slug.gsub(/_#{language}$/, "")
         persistent_menu = I18n.t("bobot.#{slug}.config.persistent_menu", locale: language, default: nil)
+        persistent_menu = I18n.t("bobot.#{short_slug}.config.persistent_menu", locale: language, default: nil) if persistent_menu.nil?
         if persistent_menu.present?
           persistent_menus << {
             locale: 'default',

data/lib/bobot/version.rb

@@ -1,7 +1,7 @@
 module Bobot
   class Version
     MAJOR = 4
-    MINOR = 7
+    MINOR = 8
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bobot
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Navid EMAD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n