mir/moebooru
2
0
Fork 0
mirror of https://github.com/moebooru/moebooru synced 2025-09-01 14:35:14 +00:00
Code Issues Releases Wiki Activity

Move i18n js side setters

Browse Source 
Seems better done in application instead of inlined and potentially done in wrong timing.
Still wrong timing though.
This commit is contained in:
nanaya
2020-04-04 02:40:57 +09:00
parent 55011ceb9a
commit 12c81d7395
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/application.coffee
View File

@@ -27,6 +27,9 @@
#= require_tree ./_classes #= require_tree ./_classes
I18n.defaultLocale = locale.default
I18n.locale = locale.current
Moe.checkAll = new Moe.CheckAll Moe.checkAll = new Moe.CheckAll
Moe.timeago = new Moe.Timeago Moe.timeago = new Moe.Timeago

4
app/views/layouts/_locale.html.erb
View File

@@ -1,4 +0,0 @@
<script type="text/javascript">
I18n.defaultLocale = "<%= I18n.default_locale %>";
I18n.locale = "<%= I18n.locale %>";
</script>

10
app/views/layouts/application.html.erb
View File

@@ -32,9 +32,17 @@
<script id="user-blacklisted-tags" type="application/json"> <script id="user-blacklisted-tags" type="application/json">
<%= json_escape @current_user.blacklisted_tags_array.to_json.html_safe %> <%= json_escape @current_user.blacklisted_tags_array.to_json.html_safe %>
</script> </script>
<script type="text/javascript">
window.locale = {
current: "<%= I18n.locale %>",
default: "<%= I18n.default_locale %>",
}
</script>
<%= javascript_include_tag :application %> <%= javascript_include_tag :application %>
<%= javascript_include_tag 'application-legacy' %> <%= javascript_include_tag 'application-legacy' %>
<%= render 'layouts/locale' %>
<!--[if lt IE 8]> <!--[if lt IE 8]>
<script src="/IE8.js" type="text/javascript"></script> <script src="/IE8.js" type="text/javascript"></script>
<![endif]--> <![endif]-->