Update en.php to show "City, State" in floater for United States (#1329)

* Fix issue #1327 * Update en.php This is just a simple change that I made so that it is clear to users in the United States to input City, State together (e.g. Fort Myers, FL) in the City field when adding new customers. On the Add Customer floater, it now requests "City, State:" instead of just "City:" Then, when you set up your invoice templates, it pulls city & state together so that the mailing address is properly formatted.
kimai · Apr 12, 2020 · 69694ed · 69694ed
1 parent 20646db
commit 69694ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/floaters.php b/core/floaters.php
@@ -106,7 +106,7 @@
                 $view->assign('id', $id);
             }
         } else {
-            $view->assign('timezone', $kga['timezone']);
+            $view->assign('customer', array('timezone' => $kga['timezone']));
         }
 
         $view->assign('timezones', timezoneList());

diff --git a/language/en.php b/language/en.php
@@ -120,7 +120,7 @@
 
     "street" => "Street",
     "zipcode" => "Zipcode",
-    "city" => "City",
+    "city" => "City, State",
     "country" => "Country",
     "telephon" => "Phone",
     "fax" => "Fax",