diff --git a/buildzip.php b/buildzip.php index c88bc86..1f369f2 100755 --- a/buildzip.php +++ b/buildzip.php @@ -8,7 +8,7 @@ if ( !isset($argv) || !isset($argv[1]) ) { } $repo = $argv[1]; -$dir = sys_get_temp_dir(). DIRECTORY_SEPARATOR. "mytinytodo.build"; #php 5.2.1 +$dir = sys_get_temp_dir(). DIRECTORY_SEPARATOR. "mytinytodo.build"; $curdir = getcwd(); $zipfile = $curdir. DIRECTORY_SEPARATOR. 'mytinytodo-v@VERSION-@REV.zip'; $ver = 0; @@ -43,14 +43,8 @@ print "> Version is $ver\n"; rename('db/todolist.db.empty', 'db/todolist.db'); -/* -$fh = fopen("./content/themes/default/index.php", 'a') or die("cant write index.php\n"); -fwrite($fh, "\n"); -fclose($fh); -*/ - unlink('./docker-config.php'); -unlink('./content/lang/en-rtl.json'); +unlink('./includes/lang/en-rtl.json'); unlink('./mtt-edit-settings.php'); /* diff --git a/src/includes/class.lang.php b/src/includes/class.lang.php index 0927f65..56edbff 100644 --- a/src/includes/class.lang.php +++ b/src/includes/class.lang.php @@ -13,7 +13,7 @@ class Lang { protected static $instance; - protected static $langDir = MTTLANG; + protected static $langDir = MTTINC . 'lang/'; protected $code = 'en'; protected $default = 'en'; protected $strings; diff --git a/src/content/lang/.htaccess b/src/includes/lang/.htaccess similarity index 100% rename from src/content/lang/.htaccess rename to src/includes/lang/.htaccess diff --git a/src/content/lang/ar.json b/src/includes/lang/ar.json similarity index 100% rename from src/content/lang/ar.json rename to src/includes/lang/ar.json diff --git a/src/content/lang/bg.json b/src/includes/lang/bg.json similarity index 100% rename from src/content/lang/bg.json rename to src/includes/lang/bg.json diff --git a/src/content/lang/ca.json b/src/includes/lang/ca.json similarity index 100% rename from src/content/lang/ca.json rename to src/includes/lang/ca.json diff --git a/src/content/lang/cns.json b/src/includes/lang/cns.json similarity index 100% rename from src/content/lang/cns.json rename to src/includes/lang/cns.json diff --git a/src/content/lang/cz.json b/src/includes/lang/cz.json similarity index 100% rename from src/content/lang/cz.json rename to src/includes/lang/cz.json diff --git a/src/content/lang/da.json b/src/includes/lang/da.json similarity index 100% rename from src/content/lang/da.json rename to src/includes/lang/da.json diff --git a/src/content/lang/de.json b/src/includes/lang/de.json similarity index 100% rename from src/content/lang/de.json rename to src/includes/lang/de.json diff --git a/src/content/lang/el.json b/src/includes/lang/el.json similarity index 100% rename from src/content/lang/el.json rename to src/includes/lang/el.json diff --git a/src/content/lang/en-rtl.json b/src/includes/lang/en-rtl.json similarity index 100% rename from src/content/lang/en-rtl.json rename to src/includes/lang/en-rtl.json diff --git a/src/content/lang/en.json b/src/includes/lang/en.json similarity index 100% rename from src/content/lang/en.json rename to src/includes/lang/en.json diff --git a/src/content/lang/es-mx.json b/src/includes/lang/es-mx.json similarity index 100% rename from src/content/lang/es-mx.json rename to src/includes/lang/es-mx.json diff --git a/src/content/lang/es.json b/src/includes/lang/es.json similarity index 100% rename from src/content/lang/es.json rename to src/includes/lang/es.json diff --git a/src/content/lang/fa.json b/src/includes/lang/fa.json similarity index 100% rename from src/content/lang/fa.json rename to src/includes/lang/fa.json diff --git a/src/content/lang/fr.json b/src/includes/lang/fr.json similarity index 100% rename from src/content/lang/fr.json rename to src/includes/lang/fr.json diff --git a/src/content/lang/he.json b/src/includes/lang/he.json similarity index 100% rename from src/content/lang/he.json rename to src/includes/lang/he.json diff --git a/src/content/lang/hu.json b/src/includes/lang/hu.json similarity index 100% rename from src/content/lang/hu.json rename to src/includes/lang/hu.json diff --git a/src/content/lang/it.json b/src/includes/lang/it.json similarity index 100% rename from src/content/lang/it.json rename to src/includes/lang/it.json diff --git a/src/content/lang/ja.json b/src/includes/lang/ja.json similarity index 100% rename from src/content/lang/ja.json rename to src/includes/lang/ja.json diff --git a/src/content/lang/lt.json b/src/includes/lang/lt.json similarity index 100% rename from src/content/lang/lt.json rename to src/includes/lang/lt.json diff --git a/src/content/lang/mk.json b/src/includes/lang/mk.json similarity index 100% rename from src/content/lang/mk.json rename to src/includes/lang/mk.json diff --git a/src/content/lang/nl.json b/src/includes/lang/nl.json similarity index 100% rename from src/content/lang/nl.json rename to src/includes/lang/nl.json diff --git a/src/content/lang/no.json b/src/includes/lang/no.json similarity index 100% rename from src/content/lang/no.json rename to src/includes/lang/no.json diff --git a/src/content/lang/pl.json b/src/includes/lang/pl.json similarity index 100% rename from src/content/lang/pl.json rename to src/includes/lang/pl.json diff --git a/src/content/lang/pt-br.json b/src/includes/lang/pt-br.json similarity index 100% rename from src/content/lang/pt-br.json rename to src/includes/lang/pt-br.json diff --git a/src/content/lang/pt-pt.json b/src/includes/lang/pt-pt.json similarity index 100% rename from src/content/lang/pt-pt.json rename to src/includes/lang/pt-pt.json diff --git a/src/content/lang/ro.json b/src/includes/lang/ro.json similarity index 100% rename from src/content/lang/ro.json rename to src/includes/lang/ro.json diff --git a/src/content/lang/ru.json b/src/includes/lang/ru.json similarity index 100% rename from src/content/lang/ru.json rename to src/includes/lang/ru.json diff --git a/src/content/lang/sk.json b/src/includes/lang/sk.json similarity index 100% rename from src/content/lang/sk.json rename to src/includes/lang/sk.json diff --git a/src/content/lang/sl.json b/src/includes/lang/sl.json similarity index 100% rename from src/content/lang/sl.json rename to src/includes/lang/sl.json diff --git a/src/content/lang/sr.json b/src/includes/lang/sr.json similarity index 100% rename from src/content/lang/sr.json rename to src/includes/lang/sr.json diff --git a/src/content/lang/sv.json b/src/includes/lang/sv.json similarity index 100% rename from src/content/lang/sv.json rename to src/includes/lang/sv.json diff --git a/src/content/lang/th.json b/src/includes/lang/th.json similarity index 100% rename from src/content/lang/th.json rename to src/includes/lang/th.json diff --git a/src/content/lang/tr.json b/src/includes/lang/tr.json similarity index 100% rename from src/content/lang/tr.json rename to src/includes/lang/tr.json diff --git a/src/content/lang/uk.json b/src/includes/lang/uk.json similarity index 100% rename from src/content/lang/uk.json rename to src/includes/lang/uk.json diff --git a/src/content/lang/vi.json b/src/includes/lang/vi.json similarity index 100% rename from src/content/lang/vi.json rename to src/includes/lang/vi.json diff --git a/src/content/lang/zh-tw.json b/src/includes/lang/zh-tw.json similarity index 100% rename from src/content/lang/zh-tw.json rename to src/includes/lang/zh-tw.json diff --git a/src/init.php b/src/init.php index 1a305b9..f7cfe1c 100644 --- a/src/init.php +++ b/src/init.php @@ -12,7 +12,6 @@ if (version_compare(PHP_VERSION, '7.2.0') < 0) { if(!defined('MTTPATH')) define('MTTPATH', dirname(__FILE__) .'/'); if(!defined('MTTINC')) define('MTTINC', MTTPATH. 'includes/'); if(!defined('MTTCONTENT')) define('MTTCONTENT', MTTPATH. 'content/'); -if(!defined('MTTLANG')) define('MTTLANG', MTTCONTENT. 'lang/'); if(!defined('MTTTHEMES')) define('MTTTHEMES', MTTCONTENT. 'themes/'); if (getenv('MTT_ENABLE_DEBUG') == 'YES') {