Merge pull request #841 from opf/hotfix/javascript-helper-include

Fix asset precompilation with empty database
pull/840/head
Martin Linkhorst 11 years ago
commit 6adfdfc4e4
  1. 4
      app/assets/javascripts/specific/main_menu.js.erb
  2. 2
      config/locales/de.yml
  3. 2
      config/locales/en.yml

@ -1,10 +1,8 @@
<% environment.context_class.instance_eval { include ApplicationHelper } %>
jQuery(document).ready(function($) { jQuery(document).ready(function($) {
// rejigger the main-menu sub-menu functionality. // rejigger the main-menu sub-menu functionality.
$("#main-menu .toggler").remove(); // remove the togglers so they're inserted properly later. $("#main-menu .toggler").remove(); // remove the togglers so they're inserted properly later.
var toggler = $('<a class="toggler"><%= icon_wrapper("icon6 icon-toggler icon-arrow-right5-2", I18n.t("description_menu_item_toggle")) %></a>') var toggler = $('<a class="toggler"><span class="icon6 icon-toggler icon-arrow-right5-2"/><span class="hidden-for-sighted">' + I18n.t("js.label_menu_item_toggle") + '</span></a>')
.click(function(event) { .click(function(event) {
var target = $(this); var target = $(this);

@ -473,7 +473,6 @@ de:
description_filter: "Filter" description_filter: "Filter"
description_filter_toggle: "Filter aus/einblenden" description_filter_toggle: "Filter aus/einblenden"
description_category_reassign: "Neue Kategorie wählen" description_category_reassign: "Neue Kategorie wählen"
description_menu_item_toggle: "Untermenüpunkte ein-/ausblenden"
description_message_content: "Nachrichteninhalt" description_message_content: "Nachrichteninhalt"
description_my_project: "Sie sind Mitglied" description_my_project: "Sie sind Mitglied"
description_notes: "Kommentare" description_notes: "Kommentare"
@ -586,6 +585,7 @@ de:
noneSelection: "(keine)" noneSelection: "(keine)"
label_collapse_all: "Alle zuklappen" label_collapse_all: "Alle zuklappen"
label_expand_all: "Alle aufklappen" label_expand_all: "Alle aufklappen"
label_menu_item_toggle: "Untermenüpunkte ein-/ausblenden"
label_account: "Konto" label_account: "Konto"
label_activity: "Aktivität" label_activity: "Aktivität"

@ -470,7 +470,6 @@ en:
description_filter: "Filter" description_filter: "Filter"
description_filter_toggle: "Show/Hide filter" description_filter_toggle: "Show/Hide filter"
description_category_reassign: "Choose category" description_category_reassign: "Choose category"
description_menu_item_toggle: "Show/hide submenu items"
description_message_content: "Message content" description_message_content: "Message content"
description_my_project: "You are member" description_my_project: "You are member"
description_notes: "Notes" description_notes: "Notes"
@ -583,6 +582,7 @@ en:
noneSelection: "(none)" noneSelection: "(none)"
label_collapse_all: "Collapse all" label_collapse_all: "Collapse all"
label_expand_all: "Expand all" label_expand_all: "Expand all"
label_menu_item_toggle: "Show/hide submenu items"
label_account: "Account" label_account: "Account"
label_activity: "Activity" label_activity: "Activity"

Loading…
Cancel
Save