Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

move key so it does not interfere with other errors

This commit is contained in:
Sam 2018-03-09 16:41:50 +11:00
parent 8fd47314d9
commit 7c0e6b820e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/themes_controller.rb
View File

@ -80,7 +80,7 @@ class Admin::ThemesController < Admin::AdminController
@theme = RemoteTheme.import_theme(params[:remote], current_user, private_key: params[:private_key]) @theme = RemoteTheme.import_theme(params[:remote], current_user, private_key: params[:private_key])
render json: @theme, status: :created render json: @theme, status: :created
rescue RuntimeError rescue RuntimeError
render_json_error I18n.t('errors.theme.other') render_json_error I18n.t('themes.error_importing')
end end
else else
render json: @theme.errors, status: :unprocessable_entity render json: @theme.errors, status: :unprocessable_entity

3
config/locales/server.en.yml
View File

@ -59,6 +59,7 @@ en:
themes: themes:
bad_color_scheme: "Can not update theme, invalid color scheme" bad_color_scheme: "Can not update theme, invalid color scheme"
other_error: "Something went wrong updating theme" other_error: "Something went wrong updating theme"
error_importing: "Error cloning git repository, access is denied or repository is not found"
settings_errors: settings_errors:
invalid_yaml: "Provided YAML is invalid." invalid_yaml: "Provided YAML is invalid."
data_type_not_a_number: "Setting `%{name}` type is unsupported. Supported types are `integer`, `bool`, `list` and `enum`" data_type_not_a_number: "Setting `%{name}` type is unsupported. Supported types are `integer`, `bool`, `list` and `enum`"
@ -151,8 +152,6 @@ en:
other: ! '%{count} errors prohibited this %{model} from being saved' other: ! '%{count} errors prohibited this %{model} from being saved'
embed: embed:
load_from_remote: "There was an error loading that post." load_from_remote: "There was an error loading that post."
theme:
other: "Error cloning git repository, access is denied or repository is not found"
site_settings: site_settings:
min_username_length_exists: "You cannot set the minimum username length above the shortest username." min_username_length_exists: "You cannot set the minimum username length above the shortest username."
min_username_length_range: "You cannot set the minimum above the maximum." min_username_length_range: "You cannot set the minimum above the maximum."