na

Gemfile.lock

@@ -75,11 +75,11 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    acts_as_list (1.2.1)
+    acts_as_list (1.2.2)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ancestry (4.3.3)
       activerecord (>= 5.2.6)
     base64 (0.2.0)
@@ -88,8 +88,8 @@ GEM
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
-    builder (3.2.4)
-    concurrent-ruby (1.3.1)
+    builder (3.3.0)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
     css_parser (1.17.1)
@@ -104,7 +104,7 @@ GEM
       dotenv (= 3.1.2)
       railties (>= 6.1)
     drb (2.2.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     ffi (1.17.0-aarch64-linux-gnu)
     ffi (1.17.0-arm-linux-gnu)
     ffi (1.17.0-arm64-darwin)
@@ -116,7 +116,7 @@ GEM
     htmlentities (4.3.4)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
+    image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     importmap-rails (2.0.1)
@@ -124,7 +124,7 @@ GEM
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.12.0)
@@ -142,6 +142,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
+    logger (1.6.0)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -151,15 +152,15 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.23.1)
+    minitest (5.24.1)
     mobility (1.3.0.rc3)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
     msgpack (1.7.2)
     mutex_m (0.2.0)
-    net-imap (0.4.12)
+    net-imap (0.4.14)
       date
       net-protocol
     net-pop (0.1.2)
@@ -169,19 +170,19 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.5-aarch64-linux)
+    nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm-linux)
+    nokogiri (1.16.7-arm-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.7-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86-linux)
+    nokogiri (1.16.7-x86-linux)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
-    pg (1.5.6)
+    pg (1.5.7)
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
@@ -200,11 +201,11 @@ GEM
       railties (>= 7.0.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (6.0.1)
     puma (6.4.2)
       nio4r (~> 2.0)
-    racc (1.8.0)
-    rack (3.0.11)
+    racc (1.8.1)
+    rack (3.1.7)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -248,23 +249,25 @@ GEM
       redis-client (>= 0.22.0)
     redis-client (0.22.2)
       connection_pool
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
-    ruby-vips (2.2.1)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
-    sidekiq (7.2.4)
+      logger
+    sidekiq (7.3.0)
       concurrent-ruby (< 2)
       connection_pool (>= 2.3.0)
+      logger
       rack (>= 2.2.4)
-      redis-client (>= 0.19.0)
+      redis-client (>= 0.22.2)
     stimulus-rails (1.3.3)
       railties (>= 6.0.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     thor (1.3.1)
     timeout (0.4.1)
-    turbo-rails (2.0.5)
+    turbo-rails (2.0.6)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
@@ -279,7 +282,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.17)
 
 PLATFORMS
   aarch64-linux

app/controllers/languages_controller.rb

@@ -12,10 +12,30 @@ class LanguagesController < ApplicationController
 private
 
   def accept_language
-    @accept_language ||= request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').map { |l|
-      lang, q_factor = l.split(';q=')
-      [lang, (q_factor || '1').to_f]
-    }.sort_by { |_, q| -q }.map(&:first).first&.split('-')&.first
+    @accept_language ||= first_matching_language
+  end
+
+
+  def first_matching_language
+    accept_languages = request.env['HTTP_ACCEPT_LANGUAGE'].to_s.split(',').map { |l|
+                          lang, q_factor = l.split(';q=')
+                          [lang, (q_factor || '1').to_f]
+                       }.sort_by { |_, q| -q }.map(&:first)
+
+    available_languages = I18n.t('languages').keys.map(&:to_s)
+
+    accept_languages.each do |lang|
+      return lang if available_languages.include?(lang)
+
+      lang_part = lang.split('-').first
+      if available_languages.include?(lang_part)
+        return lang_part
+      else
+        wildcard_match = available_languages.find { |l| l.start_with?("#{lang_part}-") }
+        return wildcard_match if wildcard_match
+      end
+    end
+    'en'
   end
 
 

app/javascript/application.js

@@ -23,6 +23,7 @@ function shuffle_cards() {
   const cards = document.querySelectorAll('.card__container')
   const card_ids = Array.from(cards).map(card => card.getAttribute('data-id'))
   let shown_cards = JSON.parse(localStorage.getItem('shown_cards')) || [];
+  
   let cards_not_shown = card_ids.filter(id => !shown_cards.includes(id));
 
   if (cards_not_shown.length <= 0) {

config/importmap.rb

@@ -10,7 +10,7 @@ pin "stimulus-use" # @0.52.2
 pin "@rails/request.js", to: "@rails--request.js.js" # @0.0.9
 pin "@rails/activestorage", to: "@rails--activestorage.js" # @7.1.3
 pin "tom-select" # @2.3.1
-pin "trix" # @2.1.1
+pin "trix" # @2.1.3
 
 # site_helper
 pin "application", preload: false

config/locales/cs.yml

@@ -1,3 +1,12 @@
 # Czech (cs_CZ)
 cs:
-  
+  can_you_spot_the_link: Co mají <span>společného?</span>
+  hello: Ahoj!
+  please_select_a_language_to_get_started: Vyberte jazyk a pusťte se do toho.
+  confirm: Potvrdit
+  get_started: Začít
+  drag_to_reveal: Přetažením odhalíte
+  shuffle_cards: Zamíchat karty
+  spot_another_link: Další souvislosti
+  challange_a_friend: Vyzvat přátele
+  learn_more: Dozvědět se více

config/locales/da.yml

@@ -1,15 +1,13 @@
 # Danish (da_DK)
 da:
-  can_you_spot_the_link: Kan du spotte <span>linket?</span>
-
-  start:
-    hello: Hej!
-    please_select_a_language_to_get_started: Vælg venligst et sprog for at komme i gang.
-    confirm: Bekræft
-
-  intro: 
-    get_started: Kom i gang
-    msg: |
-      Fattigdom og klimaforandringer er blandt verdens største udfordringer, men heldigvis sker der transformation.
-
-      Se om du kan finde sammenhængen mellem vores partnere initiativer, der ændrer spillereglerne, og deres bemærkelsesværdige indvirkning.
+  can_you_spot_the_link: Kan du se <span>linket?</span>
+  hello: Hej!
+  please_select_a_language_to_get_started: Vælg et sprog for at komme i gang.
+  confirm: Bekræft
+  get_started: Kom godt i gang
+  drag_to_reveal: Træk for at vise
+  shuffle_cards: Bland kort
+  spot_another_link: Få øje på et andet link
+  challange_a_friend: Giv en ven en udfordring
+  learn_more: Læs mere
+  

config/locales/de.yml

@@ -1,3 +1,12 @@
 # German, Germany (de_DE)
 de:
-  
+  can_you_spot_the_link: Kannst du die <span>Verbindung erkennen?</span>
+  hello: Hallo!
+  please_select_a_language_to_get_started: Wähl eine Sprache aus, um loszulegen.
+  confirm: Bestätigen
+  get_started: Los gehts
+  drag_to_reveal: Zum Aufdecken ziehen
+  shuffle_cards: Karten mischen
+  spot_another_link: Eine andere Verbindung erkennen
+  challange_a_friend: Freund*innen herausfordern
+  learn_more: Mehr lesen

config/locales/en.yml

@@ -3,6 +3,17 @@ en:
   project_name: IKEA Foundation Week 2024
   client_name: IKEA Foundation
 
+  can_you_spot_the_link: Can you spot <span>the link?</span>
+  hello: Hello!
+  please_select_a_language_to_get_started: Please select a language to get started.
+  confirm: Confirm
+  get_started: Get started
+  learn_more: Learn more  
+  spot_another_link: Spot another link  
+  challange_a_friend: Challenge a friend
+  drag_to_reveal: Drag to reveal
+  shuffle_cards: Shuffle cards
+
   languages:
     en: English
     zh: 中文 
@@ -11,7 +22,8 @@ en:
     da: Dansk 
     nl: Nederlands 
     fi: Suomi 
-    fr: Français 
+    fr-CA: Français canadien 
+    fr-FR: Français 
     de: Deutsch 
     hu: Magyar 
     it: Italiano 
@@ -36,7 +48,8 @@ en:
     da: Danish
     nl: Dutch
     fi: Finnish
-    fr: French
+    fr-CA: Français canadien
+    fr-FR: French
     de: German
     hu: Hungarian
     it: Italian
@@ -62,7 +75,8 @@ en:
     da: 🇩🇰
     nl: 🇳🇱
     fi: 🇫🇮
-    fr: 🇫🇷
+    fr-CA: 🇨🇦
+    fr-FR: 🇫🇷
     de: 🇩🇪
     hu: 🇭🇺
     it: 🇮🇹
@@ -78,22 +92,6 @@ en:
     es: 🇪🇸
     sv: 🇸🇪
     uk: 🇺🇦 
-
-  can_you_spot_the_link: Can you spot <span>the link?</span>
-  
-
-  hello: Hello!
-  please_select_a_language_to_get_started: Please select a language to get started.
-  confirm: Confirm
-
-  get_started: Get started
-
-  learn_more: Learn more  
-  spot_another_link: Spot another link  
-  challange_a_friend: Challenge a friend
-
-  drag_to_reveal: Drag to reveal
-  shuffle_cards: Shuffle cards
     
   ui:
     'yes': Yes

config/locales/es.yml

@@ -1,2 +1,12 @@
 # Spanish, Spain (es_ES)
 es:
+  can_you_spot_the_link: ¿Puedes ver <span>la conexión?</span>
+  hello: ¡Hola!
+  please_select_a_language_to_get_started: Selecciona un idioma para empezar.
+  confirm: Confirmar
+  get_started: Primeros pasos
+  drag_to_reveal: Arrastra para mostrar
+  shuffle_cards: Barajar cartas
+  spot_another_link: Encontrar otro enlace
+  challange_a_friend: Retar a un amigo
+  learn_more: Leer más

config/locales/fi.yml

@@ -1,2 +1,13 @@
 # Finnish (fi_FI)
 fi:
+  can_you_spot_the_link: Tunnistatko asioiden välisen <span>yhteyden?</span>
+  hello: Hei!
+  please_select_a_language_to_get_started: Aloita valitsemalla kieli.
+  confirm: Vahvista
+  get_started: Aloita
+  drag_to_reveal: Paljasta vetämällä
+  shuffle_cards: Sekoita kortit
+  spot_another_link: Tunnista toinen yhteys
+  challange_a_friend: Haasta kaveri
+  learn_more: Lue lisää
+    

config/locales/fr-CA.yml

@@ -0,0 +1,11 @@
+fr-CA:
+  can_you_spot_the_link: Le lien est-il <span>visible?</span>
+  hello: Bonjour!
+  please_select_a_language_to_get_started: Veuillez choisir une langue pour commencer.
+  confirm: Confirmer
+  get_started: Commencer
+  drag_to_reveal: Faites glisser pour afficher
+  shuffle_cards: Mélangez les cartes
+  spot_another_link: Autre lien
+  challange_a_friend: Défiez un ami
+  learn_more: Lire la suite

config/locales/fr-FR.yml

@@ -0,0 +1,11 @@
+fr-FR:
+  can_you_spot_the_link: Le lien est-il <span>visible?</span>
+  hello: Bonjour!
+  please_select_a_language_to_get_started: Merci de choisir une langue pour commencer.
+  confirm: Confirmer
+  get_started: C'est parti
+  drag_to_reveal: Faire glisser pour dévoiler la carte
+  shuffle_cards: Mélanger les cartes
+  spot_another_link: Autre lien
+  challange_a_friend: Défier un(e) ami(e)
+  learn_more: Lire la suite

config/locales/fr.yml

@@ -1,3 +0,0 @@
-# French, Canada (fr_CA)
-# French, France (fr_FR)
-fr:

config/locales/hr.yml

@@ -1,3 +1,13 @@
 # Croatian (hr_HR)
 hr:
+  can_you_spot_the_link: Možeš li uočiti <span>poveznicu?</span>
+  hello: Bok!
+  please_select_a_language_to_get_started: Odaberi jezik za početak.
+  confirm: Potvrdi
+  get_started: Početak
+  drag_to_reveal: Povuci za otkrivanje
+  shuffle_cards: Promiješaj karte
+  spot_another_link: Uoči još jednu poveznicu
+  challange_a_friend: Izazovi prijatelja
+  learn_more: Saznaj više
   

config/locales/hu.yml

@@ -1,3 +1,12 @@
 # Hungarian (hu_HU)
 hu:
-  
+  can_you_spot_the_link: Te tudod, <span>mi köti össze ezt a két dolgot?</span>
+  hello: Szia!
+  please_select_a_language_to_get_started: A kezdéshez válassz nyelvet.
+  confirm: Megerősítés
+  get_started: Kezdés
+  drag_to_reveal: Húzd el a megjelenítéshez
+  shuffle_cards: Kártyák keverése
+  spot_another_link: Találd ki, mi köt össze két másik dolgot
+  challange_a_friend: Hívd ki egy barátodat
+  learn_more: Olvasnivalók

config/locales/it.yml

@@ -1,3 +1,12 @@
 # Italian (it_IT)
 it:
-  
+  can_you_spot_the_link: Riesci a trovare <span>il legame?</span>
+  hello: Ciao!
+  please_select_a_language_to_get_started: Seleziona una lingua per iniziare.
+  confirm: Conferma
+  get_started: Inizia
+  drag_to_reveal: Trascina per visualizzare
+  shuffle_cards: Mischia le carte
+  spot_another_link: Trova un altro legame
+  challange_a_friend: Sfida un amico
+  learn_more: Scopri di più

config/locales/ja.yml

@@ -1,2 +1,12 @@
 # Japanese (ja_JP)
 ja:
+  can_you_spot_the_link: リンクを見つけられますか？
+  hello: こんにちは！
+  please_select_a_language_to_get_started: 言語を選択して開始してください。
+  confirm: 確定
+  get_started: スタート
+  drag_to_reveal: ドラッグして表示
+  shuffle_cards: カードをシャッフルする
+  spot_another_link: 別のリンクを見つける
+  challange_a_friend: 友人に働きかけよう
+  learn_more: もっと見る

config/locales/ko.yml

@@ -1,3 +1,12 @@
 # Korean (ko_KR)
 ko:
-  
+  can_you_spot_the_link: 연관성을 찾을 수 있나요?
+  hello: 안녕하세요!
+  please_select_a_language_to_get_started: 시작하려면 언어를 선택하세요.
+  confirm: 확인
+  get_started: 시작하기
+  drag_to_reveal: 드래그하여 보기
+  shuffle_cards: 카드 섞기
+  spot_another_link: 다른 링크 찾기
+  challange_a_friend: 친구와 대결하기
+  learn_more: 더 보기

config/locales/nb.yml

@@ -1,3 +1,12 @@
 # Norwegian Bokmål (nb_NO)
 nb:
-  
+  can_you_spot_the_link: Kan du finne <span>koblingen?</span>
+  hello: Hallo!
+  please_select_a_language_to_get_started: Velg et språk for å komme i gang.
+  confirm: Bekreft
+  get_started: Kom i gang
+  drag_to_reveal: Dra for å vise
+  shuffle_cards: Bland kortene
+  spot_another_link: Finn en annen kobling
+  challange_a_friend: Utfordre en venn
+  learn_more: Les mer

config/locales/nl.yml

@@ -1,3 +1,13 @@
 # Dutch (nl_NL)
 nl:
-  
+  can_you_spot_the_link: Kun je <span>de link zien?</span>
+  hello: Hallo!
+  please_select_a_language_to_get_started: Selecteer een taal om te beginnen.
+  confirm: Bevestigen
+  get_started: Aan de slag
+  drag_to_reveal: Sleep om te onthullen
+  shuffle_cards: Schud kaarten
+  spot_another_link: Ontdek een andere link
+  challange_a_friend: Daag een vriend uit
+  learn_more: Lees meer
+    

config/locales/pl.yml

@@ -1,3 +1,12 @@
 # Polish (pl_PL)
 pl:
-  
+  can_you_spot_the_link: Czy widzisz <span>związek?</span>
+  hello: Cześć!
+  please_select_a_language_to_get_started: Wybierz język, aby rozpocząć.
+  confirm: Potwierdź
+  get_started: Zaczynamy
+  drag_to_reveal: Przeciągnij, aby odkryć
+  shuffle_cards: Tasuj karty
+  spot_another_link: Znajdź inny związek
+  challange_a_friend: Zapytaj znajomego
+  learn_more: Przeczytaj więcej

config/locales/pt.yml

@@ -1,3 +1,12 @@
 # Portuguese (pt_PT)
 pt:
-  
+  can_you_spot_the_link: Sabe qual é <span>a relação?</span>
+  hello: Olá.
+  please_select_a_language_to_get_started: Escolha um idioma para começar.
+  confirm: Confirmar
+  get_started: Começar
+  drag_to_reveal: Arrastar para revelar
+  shuffle_cards: Baralhar as cartas
+  spot_another_link: Descobrir outra relação
+  challange_a_friend: Desafiar um amigo
+  learn_more: Ler mais

config/locales/ro.yml

@@ -1,3 +1,12 @@
 # Romanian (ro_RO)
 ro:
-  
+  can_you_spot_the_link: Poți să găsești <span>legătura?</span>
+  hello: Salut!
+  please_select_a_language_to_get_started: Selectează o limbă pentru a începe.
+  confirm: Confirmă
+  get_started: Începe
+  drag_to_reveal: Trage pentru a dezvălui
+  shuffle_cards: Amestecă bine cartonașele
+  spot_another_link: Găsește o altă legătură
+  challange_a_friend: Provoacă un prieten
+  learn_more: Citește mai multe

config/locales/sk.yml

@@ -1,3 +1,12 @@
 # Slovak (sk_SK)
 sk:
-  
+  can_you_spot_the_link: Dokážete nájsť <span>súvislosť?</span>
+  hello: Dobrý deň!
+  please_select_a_language_to_get_started: Na začiatku si vyberte jazyk.
+  confirm: Potvrdiť
+  get_started: Poďme na to!
+  drag_to_reveal: Potiahnite a odhaľte
+  shuffle_cards: Zamiešať karty
+  spot_another_link: Objaviť ďalšiu súvislosť
+  challange_a_friend: Vyzvať priateľa
+  learn_more: Zistiť viac

config/locales/sl.yml

@@ -1,3 +1,12 @@
 # Slovenian (sl_SL)
 sl:
-  
+  can_you_spot_the_link: Ali opaziš <span>povezavo?</span>
+  hello: Hej!
+  please_select_a_language_to_get_started: Za začetek izberi jezik.
+  confirm: Potrdi
+  get_started: Za začetek
+  drag_to_reveal: Povleci in razkrij
+  shuffle_cards: Premešaj kartice
+  spot_another_link: Odkrij drugo povezavo
+  challange_a_friend: Izzovi prijatelja/-ico
+  learn_more: Spoznaj več

config/locales/sr.yml

@@ -1,3 +1,12 @@
 # Serbian, Serbia, Latin (sr_RS)
 sr:
-  
+  can_you_spot_the_link: Možeš li da vidiš <span>vezu?</span>
+  hello: Zdravo!
+  please_select_a_language_to_get_started: Izaberi jezik da započneš.
+  confirm: Potvrdi
+  get_started: Započni
+  drag_to_reveal: Prevuci da otkriješ
+  shuffle_cards: Promešaj kartice
+  spot_another_link: Uoči još jednu vezu
+  challange_a_friend: Izazovi prijatelja
+  learn_more: Pročitaj više

config/locales/sv.yml

@@ -1,3 +1,12 @@
 # Swedish (sv_SE)
 sv: 
-  
+  can_you_spot_the_link: Kan du se <span>sambandet?</span>
+  hello: Hej!
+  please_select_a_language_to_get_started: Välj språk för att komma igång.
+  confirm: Bekräfta
+  get_started: Kom igång
+  drag_to_reveal: Dra för att visa
+  shuffle_cards: Blanda korten
+  spot_another_link: Se ett annat samband
+  challange_a_friend: Utmana en vän
+  learn_more: Läs mer

config/locales/uk.yml

@@ -1,3 +1,12 @@
 # Ukrainian (uk_UA)
 uk:
-  
+  can_you_spot_the_link: Чи бачите ви <span>зв’язок?</span>
+  hello: Привіт!
+  please_select_a_language_to_get_started: Оберіть мову, щоб почати.
+  confirm: Підтвердити
+  get_started: Початок роботи
+  drag_to_reveal: Перетягніть, щоб відкрити
+  shuffle_cards: Перемішайте карти
+  spot_another_link: Знайдіть інший зв’язок
+  challange_a_friend: Киньте виклик другу
+  learn_more: Докладніше

config/locales/zh.yml

@@ -1,3 +1,12 @@
 # Chinese (zh_CN)
 zh:
-  
+  can_you_spot_the_link: 你能找到<span>其中的联系吗</span>
+  hello: 嗨！
+  please_select_a_language_to_get_started: 请选择一种语言以开始。
+  confirm: 确认
+  get_started: 开始
+  drag_to_reveal: 拖动以显示
+  shuffle_cards: 洗牌
+  spot_another_link: 发现另一个联系
+  challange_a_friend: 挑战一位朋友
+  learn_more: 阅读更多

config/routes.rb

@@ -8,7 +8,7 @@ Rails.application.routes.draw do
   get 'admin', to: redirect('/admin/en')
 
   namespace :admin do
-    scope ':locale', constraints: { locale: /en|zh|hr|cs|da|nl|fi|fr|fr|de|hu|it|ja|ko|nb|pl|pt|ro|sr|sk|sl|es|sv|uk/ } do
+    scope ':locale', constraints: { locale: /en|zh|hr|cs|da|nl|fi|fr-CA|fr-FR|de|hu|it|ja|ko|nb|pl|pt|ro|sr|sk|sl|es|sv|uk/ } do
 
       # Assets
       resources :assets do
@@ -50,7 +50,7 @@ Rails.application.routes.draw do
     get  'login/verification', to: 'sessions#verification'
   end
 
-  scope ':locale', constraints: { locale: /en|zh|hr|cs|da|nl|fi|fr|fr|de|hu|it|ja|ko|nb|pl|pt|ro|sr|sk|sl|es|sv|uk/ } do
+  scope ':locale', constraints: { locale: /en|zh|hr|cs|da|nl|fi|fr-CA|fr-FR|de|hu|it|ja|ko|nb|pl|pt|ro|sr|sk|sl|es|sv|uk/ } do
     get '', to: 'site#index'
     get '*url', to: 'site#page', constraints: lambda { |req| req.path.exclude?('storage') }
   end