diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d52eead8ee88c97df7d3e0f9e0a7f127baac3b6..95b712ad34048dc6e91aac1020461ff2028a0120 100644 --- 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 index 497a9579d127b3124228595a96bf7442402070d6..71ab4f1f6d72cdec7537c0623ab7c7cf5e6ecd6e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -44,11 +44,12 @@ class ApplicationController < ActionController::Base 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 index a69e7fe87efaffd9c6ec08ae7bf7e563ce2f024d..7e2b333ce0a95a7ea605bec5057c8cd848005715 100644 --- 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 index 80732fc6b8aa27b30224ce38ede4ec089ce5a416..0ab37bb2682fc65c1693643c256a16d550608701 100644 --- 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 index 6664df72356dfd7e059aeca87055154e5cb8eba0..3075e92f6f5cae140ca4fb62a76c7ed3b106dcab 100755 --- 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 index 13f8d9107fc7c47d1dd6deee30241ee4a9beaebd..91d83e388fc44a771ae4298d43efc9b8e5a9f80c 100755 --- 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