Merge tag 'v1.8.9' into transifex

This commit is contained in:
Maikel Linke
2017-04-06 10:36:14 +10:00
23 changed files with 139 additions and 27 deletions

View File

@@ -105,6 +105,7 @@ module Openfoodnetwork
config.assets.precompile += ['mail/all.css']
config.assets.precompile += ['search/all.css', 'search/*.js']
config.assets.precompile += ['shared/*']
config.assets.precompile += ['qz/*']
config.active_support.escape_html_entities_in_json = true
end

View File

@@ -109,6 +109,7 @@ en:
columns: Columns
actions: Actions
viewing: "Viewing: %{current_view_name}"
description: Description
whats_this: What's this?
@@ -223,6 +224,9 @@ en:
inherits_properties?: Inherits Properties?
available_on: Available On
av_on: "Av. On"
properties:
property_name: Property Name
inherited_property: Inherited Property
variants:
to_order_tip: "Items made to order do not have a set stock level, such as loaves of bread made fresh to order."
@@ -503,9 +507,6 @@ en:
advanced_settings: Advanced Settings
update_and_close: Update and Close
producer_properties:
form:
property: Property
value: Value
index:
title: Producer Properties
shared: