bobot 4.7.0 → 4.8.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/bobot/page.rb +10 -0
- data/lib/bobot/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8bcdcfe9c793c901a6e5a93db7f21076bc2e878c9b5b4e953c5ea7e7d8cc28fc
|
4
|
+
data.tar.gz: '013236480a0426eb37567665fa8e4fde64824908e567d5932aa0056884ccd8ce'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: af170c826e5e8fe936fb49979e3b091de59089dfa35a3bae102f538d3a8fe1abd184c27ce738f0f850d32e92424bb72d6e40cf6b2430f0ff38276adf4229b1eb
|
7
|
+
data.tar.gz: 03c676d71f1e547dd314378de74b01a3ee0ad255e125bb5d1049007454ea203f28af7a26e473a49fcb84cb5003b9f0b77fd8022011e81c89260253c7dc1883da
|
data/lib/bobot/page.rb
CHANGED
@@ -318,7 +318,9 @@ module Bobot
|
|
318
318
|
greeting_texts = []
|
319
319
|
if self.language.nil?
|
320
320
|
# Default text
|
321
|
+
short_slug = slug.gsub(/_\w+$/, "")
|
321
322
|
greeting_text = I18n.t("bobot.#{slug}.config.greeting_text", locale: I18n.default_locale, default: nil)
|
323
|
+
greeting_text = I18n.t("bobot.#{short_slug}.config.greeting_text", locale: I18n.default_locale, default: nil) if greeting_text.nil?
|
322
324
|
greeting_texts << { locale: 'default', text: greeting_text } if greeting_text.present?
|
323
325
|
# Each languages
|
324
326
|
I18n.available_locales.each do |locale|
|
@@ -330,7 +332,9 @@ module Bobot
|
|
330
332
|
end
|
331
333
|
end
|
332
334
|
else
|
335
|
+
short_slug = slug.gsub(/_#{language}$/, "")
|
333
336
|
greeting_text = I18n.t("bobot.#{slug}.config.greeting_text", locale: language, default: nil)
|
337
|
+
greeting_text = I18n.t("bobot.#{short_slug}.config.greeting_text", locale: language, default: nil) if greeting_text.nil?
|
334
338
|
greeting_texts << { locale: 'default', text: greeting_text } if greeting_text.present?
|
335
339
|
end
|
336
340
|
if greeting_texts.present?
|
@@ -423,7 +427,9 @@ module Bobot
|
|
423
427
|
persistent_menus = []
|
424
428
|
# Default text
|
425
429
|
if language.nil?
|
430
|
+
short_slug = slug.gsub(/_\w+$/, "")
|
426
431
|
persistent_menu = I18n.t("bobot.#{slug}.config.persistent_menu", locale: I18n.default_locale, default: nil)
|
432
|
+
persistent_menu = I18n.t("bobot.#{short_slug}.config.persistent_menu", locale: I18n.default_locale, default: nil) if persistent_menu.nil?
|
427
433
|
if persistent_menu.present?
|
428
434
|
persistent_menus << {
|
429
435
|
locale: 'default',
|
@@ -434,7 +440,9 @@ module Bobot
|
|
434
440
|
# Each languages
|
435
441
|
I18n.available_locales.each do |locale|
|
436
442
|
persistent_menu = I18n.t("bobot.#{slug}.config.persistent_menu", locale: locale, default: nil)
|
443
|
+
persistent_menu = I18n.t("bobot.#{short_slug}.config.persistent_menu", locale: locale, default: nil) if persistent_menu.nil?
|
437
444
|
facebook_locales = I18n.t("bobot.#{slug}.config.facebook_locales", locale: locale, default: nil)
|
445
|
+
facebook_locales = I18n.t("bobot.#{short_slug}.config.facebook_locales", locale: locale, default: nil) if facebook_locales.nil?
|
438
446
|
next unless persistent_menu.present?
|
439
447
|
facebook_locales.to_a.each do |locale_long|
|
440
448
|
persistent_menus << {
|
@@ -445,7 +453,9 @@ module Bobot
|
|
445
453
|
end
|
446
454
|
end
|
447
455
|
else
|
456
|
+
short_slug = slug.gsub(/_#{language}$/, "")
|
448
457
|
persistent_menu = I18n.t("bobot.#{slug}.config.persistent_menu", locale: language, default: nil)
|
458
|
+
persistent_menu = I18n.t("bobot.#{short_slug}.config.persistent_menu", locale: language, default: nil) if persistent_menu.nil?
|
449
459
|
if persistent_menu.present?
|
450
460
|
persistent_menus << {
|
451
461
|
locale: 'default',
|
data/lib/bobot/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bobot
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.
|
4
|
+
version: 4.8.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Navid EMAD
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2018-11-
|
11
|
+
date: 2018-11-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: i18n
|