From 98d1647cea3d75ae06b00bbc09aa6b0bbbacd034 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 27 Jul 2018 12:23:19 +0100 Subject: [PATCH] Rename lang variables to reflect new commoning --- lang/en/recipe.lang | 99 +++++++++++++++------------- templates/default/new/content.tem | 67 +++++++++---------- templates/default/new/ingredient.tem | 14 ++-- templates/default/new/separator.tem | 4 +- 4 files changed, 97 insertions(+), 87 deletions(-) diff --git a/lang/en/recipe.lang b/lang/en/recipe.lang index da9c0fa..27bf656 100644 --- a/lang/en/recipe.lang +++ b/lang/en/recipe.lang @@ -1,47 +1,56 @@ NEW_TITLE = Create Recipe - -NEW_NAME = Name -NEW_NAME_DOC = The name of the recipe -NEW_NAME_PH = Recipe name - -NEW_SOURCE = Source -NEW_SOURCE_DOC = Information about the source this recipe was based on -NEW_SOURCE_PH = http://source.url - -NEW_YIELD = Yield -NEW_YIELD_DOC = How many servings does this recipe make? -NEW_YIELD_PH = X servings - -NEW_PREPINFO = Prep info -NEW_PREPINFO_DOC = How much time each step of the recipe take? -NEW_PREPINFO_PH = 10 min prep + 20 min cook - -NEW_TIMEREQ = Time required -NEW_TIMEREQ_DOC = How long does this recipe take in total? -NEW_TIMEREQ_PH = 1 hour 10 minutes - -NEW_OVENTEMP = Oven preheat -NEW_OVENTEMP_DOC = Initial oven temperature (show changes in method) -NEW_OVENTEMP_PH = None - -NEW_TYPE = Type -NEW_STATUS = Status -NEW_TAGS = Tags - -NEW_ADD_SEP = Add Separator -NEW_ADD_INGRED = Add Ingredient -NEW_ADD_INGRED5 = Add 5 Ingredients -NEW_ADD_INGRED10 = Add 10 Ingredients - - -NEW_INGREDIENTS = Ingredients -NEW_ING_QUANT_PH = Quantity -NEW_ING_ING_PH = Ingredient -NEW_ING_NOTE_PH = Notes -NEW_ING_SEP_PH = Separator text -NEW_ING_DELETE = Delete - -NEW_METHOD = Method -NEW_NOTES = Notes - NEW_CREATE = Add Recipe +NEW_ERRORS = Unable to create recipe; the following errors have been encountered: + +RECIPE_NAME = Name +RECIPE_NAME_DOC = The name of the recipe +RECIPE_NAME_PH = Recipe name + +RECIPE_SOURCE = Source +RECIPE_SOURCE_DOC = Information about the source this recipe was based on +RECIPE_SOURCE_PH = http://source.url + +RECIPE_YIELD = Yield +RECIPE_YIELD_DOC = How many servings does this recipe make? +RECIPE_YIELD_PH = X servings + +RECIPE_PREPINFO = Prep info +RECIPE_PREPINFO_DOC = How much time each step of the recipe take? +RECIPE_PREPINFO_PH = 10 min prep + 20 min cook + +RECIPE_TIMEREQ = Time required +RECIPE_TIMEREQ_DOC = How long does this recipe take in total? +RECIPE_TIMEREQ_PH = 1 hour 10 minutes + +RECIPE_OVENTEMP = Oven preheat +RECIPE_OVENTEMP_DOC = Initial oven temperature (show changes in method) +RECIPE_OVENTEMP_PH = None + +RECIPE_TYPE = Type +RECIPE_STATUS = Status +RECIPE_TAGS = Tags +RECIPE_UNITS = Units +RECIPE_PREP = Prep method + +RECIPE_ADD_SEP = Add Separator +RECIPE_ADD_INGRED = Add Ingredient +RECIPE_ADD_INGRED5 = Add 5 Ingredients +RECIPE_ADD_INGRED10 = Add 10 Ingredients + + +RECIPE_INGREDIENTS = Ingredients +RECIPE_ING_QUANT_PH = Quantity +RECIPE_ING_ING_PH = Ingredient +RECIPE_ING_NOTE_PH = Notes +RECIPE_ING_SEP_PH = Separator text +RECIPE_ING_DELETE = Delete + +RECIPE_METHOD = Method +RECIPE_NOTES = Notes + +ERR_NAMEFORMAT = Unsupported characters in the recipe name: only alphanumerics, _, -, comma, space, and period are supported. +ERR_TAGFORMAT = Unsupported characters in tag name: only alphanumerics, _, -, and space are supported. +ERR_BADSEPNAME = Unsupported characters in separator name: only alphanumerics, _, -, comma, space, and period are supported. +ERR_BADQUANTITY = No quantity specified for ingredient. +ERR_BADNOTES = Unsupported characters in notes: only alphanumerics, (, ), _, -, comma, space, and period are supported. +ERR_JSONFORMAT = Unknown or corrupt data in ingredient JSON diff --git a/templates/default/new/content.tem b/templates/default/new/content.tem index 38a4169..a06baae 100644 --- a/templates/default/new/content.tem +++ b/templates/default/new/content.tem @@ -1,38 +1,38 @@ %(errors)s
-
+

{L_NEW_TITLE}

-
-
-
-
-
-