Move default location of locale folder so now within app, a=chris

Chris Pollett [2015-01-20 18:Jan:th]
Move default location of locale folder so now within app, a=chris
Filename
configs/config.php
models/profile_model.php
diff --git a/configs/config.php b/configs/config.php
index 28731b750..c366e76d8 100755
--- a/configs/config.php
+++ b/configs/config.php
@@ -144,7 +144,10 @@ if(file_exists(WORK_DIRECTORY.PROFILE_FILE_NAME)) {
     require_once(WORK_DIRECTORY.PROFILE_FILE_NAME);
     define('PROFILE', true);
     define('CRAWL_DIR', WORK_DIRECTORY);
-    if(is_dir(WORK_DIRECTORY."/locale")) {
+    if(is_dir(WORK_DIRECTORY."/app/locale")) {
+        define('LOCALE_DIR', WORK_DIRECTORY."/app/locale");
+    } else if(is_dir(WORK_DIRECTORY."/locale")) {
+        //old work directory location
         define('LOCALE_DIR', WORK_DIRECTORY."/locale");
     } else {
         /** @ignore */
diff --git a/models/profile_model.php b/models/profile_model.php
index d593da8de..f39bb5022 100755
--- a/models/profile_model.php
+++ b/models/profile_model.php
@@ -269,7 +269,7 @@ class ProfileModel extends Model
         $to_make_dirs = array($directory, "$directory/app",
             "$directory/archives", "$directory/cache",
             "$directory/classifiers", "$directory/data", "$directory/feeds",
-            "$directory/locale", "$directory/log", "$directory/prepare",
+            "$directory/app/locale", "$directory/log", "$directory/prepare",
             "$directory/schedules", "$directory/search_filters",
             "$directory/temp");
         $dir_status = array();
@@ -279,8 +279,9 @@ class ProfileModel extends Model
                 return false;
             }
         }
-        if($dir_status["$directory/locale"] == 1) {
-            $this->db->copyRecursive(BASE_DIR."/locale", "$directory/locale");
+        if($dir_status["$directory/app/locale"] == 1) {
+            $this->db->copyRecursive(BASE_DIR."/locale",
+                "$directory/app/locale");
         }
         if($dir_status["$directory/data"] == 1) {
             $this->db->copyRecursive(BASE_DIR."/data", "$directory/data");
ViewGit