lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HOT-FIX: Issue with changes with the language file name (#466) 

* HOT-FIX: Issue with changes with the language file name

* Rubocop!
This commit is contained in:
Jesus Federico 2019-04-16 17:08:17 -04:00 committed by GitHub
parent 5ff41d0590
commit c8a799bce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -45,7 +45,7 @@ class ApplicationController < ActionController::Base
def update_locale(user)
I18n.locale = if user && user.language != 'default'
user.language
user.language.tr('-', '_')
else
http_accept_language.language_region_compatible_from(I18n.available_locales)
end

2
app/helpers/sessions_helper.rb
View File

@ -64,7 +64,7 @@ module SessionsHelper
end
def parse_user_domain(hostname)
return hostname.split('.').first unless Rails.configuration.url_host
return hostname.split('.').first if Rails.configuration.url_host.empty?
Rails.configuration.url_host.split(',').each do |url_host|
if hostname.include?(url_host)
return hostname.chomp(url_host).chomp('.')

2
config/locales/es.yml
View File

@ -93,7 +93,7 @@ es:
video: Ve nuestro tutorial de como utilizar Greenlight
upgrade: Muestrame como actualizar a versión 2.0
version: Hemos publicado una nueva version de Greenlight pero tu base de datos no es compatible.
language_name: Español (México)
language_name: Español
language_default: Por omisión (idioma del navegador)
ldap_error: No se puede conectar al servidor LDAP. Compruebe la configuración de LDAP en el archivo "env" y asegúrate de que tu servidor está ejecutándose.
login: Ingresar