wcc-contentful-app 1.3.2 → 1.4.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adb8106d1a266b17a9420bf36a400cc8e786ba145b489886482d0410ef1af762
-  data.tar.gz: 8f01a0c06d23454728df9036972e3a12cb54620de34af851052128c2c4eeeb9a
+  metadata.gz: cb8544accdf8bb9c26bcf200d5fdff9b4ae21c1292e6878958bc72d99cf38bb2
+  data.tar.gz: 955a3aaeb9d8bbee66955e29df093637a005fd58886369c2114a7df178cb53a7
 SHA512:
-  metadata.gz: dad708db58d05f7bf1733c0a5b2c4b4034394e2046772401e9daf6a18b6726105def0d2e8a3db402122d641cb35e3284aa797b5365b5adc81b4828e8337bb1c5
-  data.tar.gz: 3f4a97b5ffe1a116fddad102c94c0af936f96eb4d50dd4f03ca8e963a763b5946360fe32e030bc471e7db10d98f29241777502bb03b3a5336c1a4e79b8635be2
+  metadata.gz: 7a7e458f40876b6eb374f7916b55854ead7ff0b619ae741b068a2c3871699ca9f31dc87cbf450a5474bf8f3026baaa109519ff2030ecb49981f6b8abd2cb0386
+  data.tar.gz: 81c39f1053eff4f0144b5a1b536bf1cec297c4c061b7a2eefd789e3d8668654b8dcfa4ce17e0fe883ee1ee8fccfc4fc39e174a2886542ad80aab30eb976762c8

data/app/controllers/wcc/contentful/app/pages_controller.rb

@@ -43,6 +43,6 @@ class WCC::Contentful::App::PagesController < ApplicationController
   def global_site_config
     return unless model = site_config_model
 
-    @global_site_config ||= model.instance(preview?)
+    @global_site_config ||= model.instance(preview?, locale: I18n.locale)
   end
 end

data/lib/wcc/contentful/app/version.rb

@@ -3,7 +3,7 @@
 module WCC
   module Contentful
     module App
-      VERSION = '1.3.2'
+      VERSION = '1.4.0.rc2'
     end
   end
 end

data/lib/wcc/contentful/model/menu_button.rb

@@ -16,14 +16,27 @@ class WCC::Contentful::Model::MenuButton < WCC::Contentful::Model
     return external_link if external_link
 
     url = (link&.try(:slug) || link&.try(:url))
-    return url unless fragment.present?
-
     url = URI(url || '')
-    url.fragment = fragment
+
+    url = rewrite_to_locale(url, sys.locale) if default_locale && sys.locale != default_locale
+
+    url.fragment = fragment if fragment.present?
     url.to_s
   end
 
   def fragment
     WCC::Contentful::App::SectionHelper.section_id(section_link) if section_link
   end
+
+  private
+
+  def default_locale
+    WCC::Contentful.configuration&.default_locale
+  end
+
+  def rewrite_to_locale(uri, locale)
+    uri = URI(uri)
+    uri.path = File.join("/#{locale}", uri.path)
+    uri.to_s
+  end
 end

data/lib/wcc/contentful/model/site_config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class WCC::Contentful::Model::SiteConfig < WCC::Contentful::Model
-  def self.instance(preview = false) # rubocop:disable Style/OptionalBooleanParameter
-    find_by(foreign_key: 'default', options: { include: 4, preview: preview })
+  def self.instance(preview = false, locale: nil) # rubocop:disable Style/OptionalBooleanParameter
+    find_by(foreign_key: 'default', options: { include: 4, preview: preview, locale: locale })
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful-app
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0.rc2
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2023-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -338,14 +338,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0.rc2
 description: Models, Controllers, and Views common to Watermark Church apps
 email:
 - dev@watermark.org
@@ -444,7 +444,7 @@ homepage: https://github.com/watermarkchurch/wcc-contentful
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.3/wcc-contentful-app
+  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.4/wcc-contentful-app
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -457,9 +457,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.7
 signing_key: