From 98bb49c0eb53ed8b681585574f4fb74f4804f042 Mon Sep 17 00:00:00 2001 From: geoffhumphrey Date: Fri, 27 Sep 2019 11:55:55 -0600 Subject: [PATCH] Translation clean-up --- includes/constants.inc.php | 30 ++++---- includes/form_js.inc.php | 134 +++++++++++++++++++++++++++++------- lang/cs/cs-CZ.lang.php | 10 +-- lang/en/en-US.lang.php | 6 +- sections/bestbrewer.sec.php | 4 +- sections/brew.sec.php | 2 +- sections/sidebar.sec.php | 10 +-- 7 files changed, 144 insertions(+), 52 deletions(-) diff --git a/includes/constants.inc.php b/includes/constants.inc.php index c57d2869..400d9311 100644 --- a/includes/constants.inc.php +++ b/includes/constants.inc.php @@ -18,7 +18,8 @@ $languages = array( "en-US" => "US English", - "cs-CZ" => "Czech" + "cs-CZ" => "Czech" // , + //"es-ES" => "Spanish (Spain)" ); /** -------------------------- Theme File names and Display Name ------------------------------- @@ -73,28 +74,31 @@ echo $shipping_window_open; */ - $reg_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestRegistrationOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "long", "date-time"); - $reg_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestRegistrationDeadline'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "long", "date-time"); + if (strpos($_SESSION['prefsLanguage'],"en-") !== false) $sidebar_date_format = "long"; + else $sidebar_date_format = "short"; + + $reg_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestRegistrationOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); + $reg_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestRegistrationDeadline'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); $reg_open_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestRegistrationOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "short", "date-time"); $reg_closed_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestRegistrationDeadline'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "short", "date-time"); - $entry_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestEntryOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "long", "date-time"); ; - $entry_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestEntryDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], "long", "date-time"); + $entry_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestEntryOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); ; + $entry_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestEntryDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); $entry_open_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestEntryOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "short", "date-time"); ; $entry_closed_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestEntryDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], "short", "date-time"); - $dropoff_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestDropoffOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "long", "date-time"); ; - $dropoff_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestDropoffDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], "long", "date-time"); + $dropoff_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestDropoffOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); ; + $dropoff_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestDropoffDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); $dropoff_open_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestDropoffOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "short", "date-time"); ; $dropoff_closed_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestDropoffDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], "short", "date-time"); - $shipping_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestShippingOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "long", "date-time"); ; - $shipping_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestShippingDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], "long", "date-time"); + $shipping_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestShippingOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); ; + $shipping_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestShippingDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); $shipping_open_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestShippingOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "short", "date-time"); ; $shipping_closed_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestShippingDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], "short", "date-time"); - $judge_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestJudgeOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "long", "date-time"); ; - $judge_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestJudgeDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], "long", "date-time"); + $judge_open = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestJudgeOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); ; + $judge_closed = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestJudgeDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], $sidebar_date_format, "date-time"); $judge_open_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestJudgeOpen'], $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "short", "date-time"); ; $judge_closed_sidebar = getTimeZoneDateTime($_SESSION['prefsTimeZone'], $row_contest_dates['contestJudgeDeadline'], $_SESSION['prefsDateFormat'],$_SESSION['prefsTimeFormat'], "short", "date-time"); @@ -131,7 +135,7 @@ if (($comp_entry_limit) || ($comp_paid_entry_limit)) $entry_window_open = 2; $current_date = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "system", "date"); - $current_date_display = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "long", "date"); + $current_date_display = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], $sidebar_date_format, "date"); $current_time = getTimeZoneDateTime($_SESSION['prefsTimeZone'], time(), $_SESSION['prefsDateFormat'], $_SESSION['prefsTimeFormat'], "system", "time"); } @@ -145,7 +149,7 @@ $row_prefs_tz = mysqli_fetch_assoc($prefs_tz); $current_date = getTimeZoneDateTime($row_prefs_tz['prefsTimeZone'], time(), $row_prefs_tz['prefsDateFormat'], $row_prefs_tz['prefsTimeFormat'], "system", "date"); - $current_date_display = getTimeZoneDateTime($row_prefs_tz['prefsTimeZone'], time(), $row_prefs_tz['prefsDateFormat'], $row_prefs_tz['prefsTimeFormat'], "long", "date"); + $current_date_display = getTimeZoneDateTime($row_prefs_tz['prefsTimeZone'], time(), $row_prefs_tz['prefsDateFormat'], $row_prefs_tz['prefsTimeFormat'], $sidebar_date_format, "date"); $current_time = getTimeZoneDateTime($row_prefs_tz['prefsTimeZone'], time(), $row_prefs_tz['prefsDateFormat'], $row_prefs_tz['prefsTimeFormat'], "system", "time"); } diff --git a/includes/form_js.inc.php b/includes/form_js.inc.php index e1e68f31..7d05c50b 100644 --- a/includes/form_js.inc.php +++ b/includes/form_js.inc.php @@ -6,6 +6,61 @@ */ +$styles_entry_text = array( + "07-C" => $styles_entry_text_07C, + "09-A" => $styles_entry_text_09A, + "10-C" => $styles_entry_text_10C, + "21-B" => $styles_entry_text_21B, + "23-F" => $styles_entry_text_23F, + "24-C" => $styles_entry_text_24C, + "25-B" => $styles_entry_text_27A, + "28-A" => $styles_entry_text_28A, + "28-B" => $styles_entry_text_28C, + "29-A" => $styles_entry_text_29A, + "29-B" => $styles_entry_text_29B, + "29-C" => $styles_entry_text_29C, + "30-A" => $styles_entry_text_30A, + "30-B" => $styles_entry_text_30B, + "30-C" => $styles_entry_text_30C, + "31-A" => $styles_entry_text_30A, + "31-B" => $styles_entry_text_31B, + "32-A" => $styles_entry_text_32A, + "32-B" => $styles_entry_text_32B, + "33-A" => $styles_entry_text_33A, + "33-B" => $styles_entry_text_33B, + "34-A" => $styles_entry_text_34A, + "34-B" => $styles_entry_text_34B, + "34-C" => $styles_entry_text_34C, + "M1-A" => $styles_entry_text_M1A, + "M1-B" => $styles_entry_text_M1B, + "M1-C" => $styles_entry_text_M1C, + "M2-A" => $styles_entry_text_M2A, + "M2-B" => $styles_entry_text_M2B, + "M2-C" => $styles_entry_text_M2C, + "M2-D" => $styles_entry_text_M2D, + "M2-E" => $styles_entry_text_M2E, + "M3-A" => $styles_entry_text_M3A, + "M3-B" => $styles_entry_text_M3B, + "M4-A" => $styles_entry_text_M4A, + "M4-B" => $styles_entry_text_M4B, + "M4-C" => $styles_entry_text_M4C, + "C1-E" => $styles_entry_text_C1E, + "C2-A" => $styles_entry_text_C2A, + "C2-B" => $styles_entry_text_C2B, + "C2-C" => $styles_entry_text_C2C, + "C2-D" => $styles_entry_text_C2D, + "C2-E" => $styles_entry_text_C2E, + "C2-F" => $styles_entry_text_C2F, + "21-B1" => $styles_entry_text_21X, + "21-B2" => $styles_entry_text_21X, + "21-B3" => $styles_entry_text_21X, + "21-B4" => $styles_entry_text_21X, + "21-B5" => $styles_entry_text_21X, + "21-B6" => $styles_entry_text_21X, + "21-B7" => $styles_entry_text_21X, + "PR-X4" => $styles_entry_text_PRX4, +); + if (($section == "admin") && ($go == "styles") && ($action != "default")) { if ($styleSet != "BA") { @@ -226,7 +281,10 @@ // Beer styles that require special ingredients $value) { ?> + foreach ($special_beer_info as $key => $value) { + if (array_key_exists($key, $styles_entry_text)) $entry_text = $styles_entry_text["$key"]; + else $entry_text = $value; + ?> else if ( $("#type").val() == ""){ // Special Beer @@ -275,7 +333,7 @@ $("input[name='carbLambic']").prop("required", false); $("input[name='BDGColor']").prop("required", false); $("#specialInfo").show("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -357,8 +415,10 @@ // Styles requiring special ingredients, strength, sweetness, and carbonation $value) { ?> - + foreach ($carb_str_sweet_special_info as $key => $value) { + if (array_key_exists($key, $styles_entry_text)) $entry_text = $styles_entry_text["$key"]; + else $entry_text = $value; + ?> else if ( $("#type").val() == ""){ @@ -418,7 +478,7 @@ $("input[name='brewMead1']").prop("required", true); $("input[name='brewMead2']").prop("required", true); $("input[name='brewMead3']").prop("required", true); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); } + $("#specialInfo").show("fast"); + $("#specialInfoText").html(""); + $("#specialInfo").hide("fast"); + $("#optional").show("fast"); // $("#brewInfoOptional").attr("maxlength","65"); @@ -586,7 +652,10 @@ } ?> // Styles requiring special ingredients, carbonation, and sweetness $value) { ?> + foreach ($spec_sweet_carb_only_info as $key => $value) { + if (array_key_exists($key, $styles_entry_text)) $entry_text = $styles_entry_text["$key"]; + else $entry_text = $value; + ?> else if ( $("#type").val() == ""){ @@ -635,14 +704,17 @@ $("#brewInfo").prop("required", true); $("input[name='brewMead1']").prop("required", true); $("input[name='brewMead2']").prop("required", true); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); } // Styles requiring special ingredients and carbonation $value) { ?> + foreach ($spec_carb_only_info as $key => $value) { + if (array_key_exists($key, $styles_entry_text)) $entry_text = $styles_entry_text["$key"]; + else $entry_text = $value; + ?> else if ( $("#type").val() == ""){ @@ -689,7 +761,7 @@ $("#brewInfo").prop("required", true); $("input[name='brewMead1']").prop("required", true); $("#specialInfo").show("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); } + // Show fields for styles that require special ingredients, carb, sweetness, strength, etc. // Carb, sweetness, strength, and special info styles $(document).ready(function() { @@ -779,7 +854,7 @@ $("input[name='carbLambic']").prop("required", false); $("input[name='BDGColor']").prop("required", false); $("#specialInfo").show("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -888,7 +963,10 @@ }); - + // Sweet and sweet only styles with special ingredients $(document).ready(function() { $("#special").show("fast"); @@ -913,7 +991,7 @@ $("input[name='sweetnessLambic']").prop("required", false); $("input[name='carbLambic']").prop("required", false); $("input[name='BDGColor']").prop("required", false); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -923,7 +1001,10 @@ }); - + // Carb with special ingredients only styles $(document).ready(function() { $("#special").show("fast"); @@ -948,7 +1029,7 @@ $("input[name='sweetnessLambic']").prop("required", false); $("input[name='carbLambic']").prop("required", false); $("input[name='BDGColor']").prop("required", false); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -958,7 +1039,10 @@ }); - + // Beer styles with special ingredients only $(document).ready(function() { $("#special").show("fast"); @@ -983,7 +1067,7 @@ $("input[name='carbLambic']").prop("required", false); $("input[name='BDGColor']").prop("required", false); $("#specialInfo").show("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -1007,7 +1091,7 @@ $("#BDGColor").hide("fast"); $("#optional").hide("fast"); $("#specialInfo").show("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -1029,7 +1113,7 @@ $("#BDGColor").show("fast"); $("#optional").hide("fast"); $("#specialInfo").show("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -1051,7 +1135,7 @@ $("#BDGColor").hide("fast"); $("#optional").show("fast"); $("#specialInfo").show("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -1072,7 +1156,7 @@ $("#carbLambic").hide("fast"); $("#BDGColor").hide("fast"); $("#specialInfo").hide("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -1093,7 +1177,7 @@ $("#carbLambic").hide("fast"); $("#BDGColor").hide("fast"); $("#specialInfo").hide("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -1114,7 +1198,7 @@ $("#carbLambic").hide("fast"); $("#BDGColor").hide("fast"); $("#specialInfo").hide("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -1135,7 +1219,7 @@ $("#carbLambic").hide("fast"); $("#BDGColor").hide("fast"); $("#specialInfo").hide("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); @@ -1156,7 +1240,7 @@ $("#carbLambic").hide("fast"); $("#BDGColor").hide("fast"); $("#specialInfo").hide("fast"); - $("#specialInfoText").html(""); + $("#specialInfoText").html(""); $("#specialInfoName").html(""); $("#optional").show("fast"); diff --git a/lang/cs/cs-CZ.lang.php b/lang/cs/cs-CZ.lang.php index 4222e8b8..4b007716 100644 --- a/lang/cs/cs-CZ.lang.php +++ b/lang/cs/cs-CZ.lang.php @@ -394,7 +394,7 @@ $label_count = "Počet"; $label_total = "Celkem"; $label_participant = "Účastník"; -$label_entrant = "Entrant"; +$label_entrant = "Účastník"; $label_received = "Přijato"; $label_please_note = "Vezměte prosím na vědomí"; $label_pull_order = "Pull Order"; @@ -1024,8 +1024,8 @@ // -------------------- Sidebar -------------------- -$sidebar_text_000 = "Registrace degustátorů a obsluhy"; -$sidebar_text_001 = "Registrace obsluhy"; +$sidebar_text_000 = "Registrace degustátorů a obsluhy přijímáme od"; +$sidebar_text_001 = "Registrace obsluhy přijímáme od"; $sidebar_text_002 = "Registrace degustátorů"; $sidebar_text_003 = "Registrace je uzavřena. Byl dosažen maximální počet degustátorů a obsluhy."; $sidebar_text_004 = "do"; @@ -1451,7 +1451,7 @@ $output_text_028 = "Následující vzorky obsahují tyto alergeny zadané soutěžícím."; $output_text_029 = "Žádní soutěžící neuvedli informace o alergenech ve svých vzorcích."; -$label_this_style = "Tento styl"; +$label_this_style = "Tento styl (V angličtina)"; $label_notes = "Poznámky"; $label_possible_allergens = "Možné alergeny"; $label_please_choose = "Prosím zvolte"; @@ -1510,6 +1510,8 @@ // ---------------------------------------------------------------------------------- $output_text_031 = "Stisknutím klávesy Esc skryjete."; +$styles_entry_text_21X = "Účastník musí zadat sílu (relace: 3,0-5,0%, standard: 5,0-7,5%, dvojnásobek: 7,5-9,5%)."; +$styles_entry_text_PRX4 = "Účastník musí uvést druhy použitých čerstvých plodů."; // *********************************************************************************** diff --git a/lang/en/en-US.lang.php b/lang/en/en-US.lang.php index d9e5da84..3b386da0 100644 --- a/lang/en/en-US.lang.php +++ b/lang/en/en-US.lang.php @@ -1023,8 +1023,8 @@ // -------------------- Sidebar -------------------- -$sidebar_text_000 = "Registrations for judges or stewards"; -$sidebar_text_001 = "Registrations for stewards"; +$sidebar_text_000 = "Registrations for judges or stewards accepted"; +$sidebar_text_001 = "Registrations for stewards accepted"; $sidebar_text_002 = "Registrations for judges"; $sidebar_text_003 = "Registrations are no longer accepted. The limit of judges and stewards has been reached."; $sidebar_text_004 = "through"; @@ -1509,6 +1509,8 @@ // ---------------------------------------------------------------------------------- $output_text_031 = "Press Esc to hide."; +$styles_entry_text_21X = "Entrant MUST specify a strength (session: 3.0-5.0%, standard: 5.0-7.5%, double: 7.5-9.5%)."; +$styles_entry_text_PRX4 = "Entrant must specify the types of fresh fruit(s) used."; /** * ---------------------------------------------------------------------------------- diff --git a/sections/bestbrewer.sec.php b/sections/bestbrewer.sec.php index e8e243f9..04ab1a6b 100644 --- a/sections/bestbrewer.sec.php +++ b/sections/bestbrewer.sec.php @@ -376,7 +376,7 @@ function normalizeClubs($string) {
- +
@@ -386,7 +386,7 @@ function normalizeClubs($string) {
- Print Results + Print Results
diff --git a/sections/brew.sec.php b/sections/brew.sec.php index ed3c7122..9779ccd8 100644 --- a/sections/brew.sec.php +++ b/sections/brew.sec.php @@ -431,7 +431,7 @@ function admin_relocate($user_level,$go,$referrer) {