Skip to content

Commit 50b2680

Browse files
committed
Fix bug where models use different translations for a UD field
1 parent a7a339a commit 50b2680

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

frontend/views/layout_head.html.erb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%
22

3-
def map_user_defined_to_labels(properties)
4-
properties.map {|property| I18n.t("user_defined.#{property}")}
3+
def map_user_defined_to_labels(model, properties)
4+
properties.map {|property| I18n.t("#{model}.user_defined.#{property}")}
55
end
66

77
%>
@@ -10,7 +10,8 @@ end
1010
<%= javascript_include_tag "#{AppConfig[:frontend_proxy_prefix]}assets/user_defined_in_basic.js" %>
1111

1212
<script>
13-
var fields = <%= ASUtils.to_json(map_user_defined_to_labels(AppConfig[:user_defined_in_basic].fetch(controller.controller_name, []))).html_safe %>;
13+
var fields = <%= ASUtils.to_json(map_user_defined_to_labels(controller.controller_name.sub(/s$/, ''),
14+
AppConfig[:user_defined_in_basic].fetch(controller.controller_name, []))).html_safe %>;
1415
var read_only_view = <%= controller.action_name == 'show' %>;
1516
var hide_user_defined_section = <%= AppConfig[:user_defined_in_basic]['hide_user_defined_section'] %>;
1617

0 commit comments

Comments
 (0)