From c9c9410908828e7e67210a635bd621366fffd44f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 7 Feb 2016 08:40:59 +0100
Subject: [PATCH] Use translations instead of hard config. [skip ci]

---
 app/Support/Navigation.php      | 30 +++++++++++++++---------------
 resources/lang/en_US/config.php | 11 ++++++++---
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php
index cdd33682ea..ee028cdf22 100644
--- a/app/Support/Navigation.php
+++ b/app/Support/Navigation.php
@@ -165,21 +165,21 @@ class Navigation
     public function periodShow(Carbon $date, string $repeatFrequency)
     {
         $formatMap = [
-            '1D'      => '%e %B %Y',
-            'daily'   => '%e %B %Y',
-            'custom'  => '%e %B %Y',
-            '1W'      => 'Week %W, %Y',
-            'week'    => 'Week %W, %Y',
-            'weekly'  => 'Week %W, %Y',
-            '3M'      => '%B %Y',
-            'quarter' => '%B %Y',
-            '1M'      => '%B %Y',
-            'month'   => '%B %Y',
-            'monthly' => '%B %Y',
-            '1Y'      => '%Y',
-            'year'    => '%Y',
-            'yearly'  => '%Y',
-            '6M'      => '%B %Y',
+            '1D'      => trans('config.specific_day'),
+            'daily'   => trans('config.specific_day'),
+            'custom'  => trans('config.specific_day'),
+            '1W'      => trans('config.week_in_year'),
+            'week'    => trans('config.week_in_year'),
+            'weekly'  => trans('config.week_in_year'),
+            '3M'      => trans('config.quarter_of_year'),
+            'quarter' => trans('config.quarter_of_year'),
+            '1M'      => trans('config.month'),
+            'month'   => trans('config.month'),
+            'monthly' => trans('config.month'),
+            '1Y'      => trans('config.year'),
+            'year'    => trans('config.year'),
+            'yearly'  => trans('config.year'),
+            '6M'      => trans('config.half_year'),
 
         ];
 
diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php
index 6a4b42f53e..18a904a149 100644
--- a/resources/lang/en_US/config.php
+++ b/resources/lang/en_US/config.php
@@ -1,8 +1,13 @@
 <?php
 
 return [
-    'locale'        => 'en, English, en_US, en_US.utf8',
-    'month'         => '%B %Y',
-    'month_and_day' => '%B %e, %Y',
+    'locale'          => 'en, English, en_US, en_US.utf8',
+    'month'           => '%B %Y',
+    'month_and_day'   => '%B %e, %Y',
+    'specific_day'    => '%e %B %Y',
+    'week_in_year'    => 'Week %W, %Y',
+    'quarter_of_year' => '%B %Y',
+    'year'            => '%Y',
+    'half_year'       => '%B %Y',
 
 ];