GRN2-112: Default language fallback fails with a 500 error (bigbluebu…

…tton#469) * GRN2-112: Default language fallback fails with a 500 error * Updates for passing rspec tests * Added cache for gitlab ci * Updated cache for gitlab * Restored Dockerfile * Fixed glitch in filter for build and deployment
ostasevych · Apr 17, 2019 · 9b2424c · 9b2424c
1 parent c8a799b
commit 9b2424c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -3,6 +3,10 @@ stages:
   - build
   - deploy
 
+cache:
+  paths:
+    - /cache
+
 before_script:
 
 test:

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -44,11 +44,12 @@ def set_locale
   end
 
   def update_locale(user)
-    I18n.locale = if user && user.language != 'default'
-      user.language.tr('-', '_')
+    locale = if user && user.language != 'default'
+      user.language
     else
       http_accept_language.language_region_compatible_from(I18n.available_locales)
     end
+    I18n.locale = locale.tr('-', '_') unless locale.nil?
   end
 
   def meeting_name_limit

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -68,7 +68,7 @@ es:
   go_back: Atrás
   greenlight: Greenlight
   header:
-    create_room: Creat sala
+    create_room: Crear sala
     dropdown:
       help: "¿Necesitas ayuda?"
       home: Sala principal

diff --git a/config/locales/es_MX.yml b/config/locales/es_MX.yml
@@ -68,7 +68,7 @@ es_MX:
   go_back: Atrás
   greenlight: Greenlight
   header:
-    create_room: Creat sala
+    create_room: Crear sala
     dropdown:
       help: "¿Necesitas ayuda?"
       home: Sala principal

diff --git a/scripts/image_build.sh b/scripts/image_build.sh
@@ -53,7 +53,7 @@ if [ -z $CD_DOCKER_REPO ]; then
   export CD_DOCKER_REPO=$CD_REF_SLUG
 fi
 
-if [ "$CD_REF_NAME" != "master" ] && [[ "$CD_REF_NAME" != *"release"* ]] && [ -z $CD_BUILD_ALL ];then
+if [ "$CD_REF_NAME" != "master" ] && [[ "$CD_REF_NAME" != *"release"* ]] && ( -z $CD_BUILD_ALL ] || [ "$CD_BUILD_ALL" != "true" ] ); then
   echo "#### Docker image for $CD_REF_SLUG won't be built"
   exit 0
 fi

diff --git a/scripts/image_deploy.sh b/scripts/image_deploy.sh
@@ -69,7 +69,7 @@ if [ -z $CD_DOCKER_REPO ]; then
   export CD_DOCKER_REPO=$CD_REF_SLUG
 fi
 
-if [ "$CD_REF_NAME" != "master" ] && [[ "$CD_REF_NAME" != *"release"* ]] && [ -z $CD_DEPLOY_ALL ];then
+if [ "$CD_REF_NAME" != "master" ] && [[ "$CD_REF_NAME" != *"release"* ]] && ( [ -z $CD_DEPLOY_ALL ] || [ "$CD_DEPLOY_ALL" != "true" ] ); then
   echo "#### Docker image for $CD_DOCKER_REPO won't be deployed. The conditions for running this build were not met."
   exit 0
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,10 @@ stages: @@
       - build
       - deploy
+    cache:
+      paths:
+        - /cache
     before_script:
     test:
@@ Expand Down @@