diff --git a/.gitignore b/.gitignore index 226687e2..b9c3b5e0 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ /docs/jsdoc/html /docs/plato/html /docker/mysql/* +/docker/build/iflrandevu-* !/docker/mysql/.gitkeep /node_modules/ /npm-debug.log diff --git a/application/config/autoload.php b/application/config/autoload.php index dedfcee1..b5d8fd4c 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -64,6 +64,7 @@ $autoload['libraries'] = ['database', 'session']; */ $autoload['helper'] = [ + 'iflrandevu/branding', 'array', 'asset', 'config', @@ -86,6 +87,7 @@ $autoload['helper'] = [ 'url', 'validation' ]; +// security, render and custom_exceptions helpers are missing (comparing to master branch MASTER-DEV-NOTE) /* | ------------------------------------------------------------------- @@ -102,6 +104,7 @@ $autoload['helper'] = [ $autoload['config'] = ['app', 'google', 'email']; + /* | ------------------------------------------------------------------- | Auto-load Language files @@ -115,7 +118,7 @@ $autoload['config'] = ['app', 'google', 'email']; | */ -$autoload['language'] = []; +$autoload['language'] = []; // see /application/core/EA_Controller.php for other added languages /* | ------------------------------------------------------------------- diff --git a/application/config/config.php b/application/config/config.php index 454c62e5..d070c933 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -87,37 +87,8 @@ $config['url_suffix'] = ''; */ $languages = [ - 'ar' => 'arabic', - 'bu' => 'bulgarian', - 'ca' => 'catalan', - 'zh' => 'chinese', - 'hr' => 'croatian', - 'cs' => 'czech', - 'da' => 'danish', - 'nl' => 'dutch', - 'en' => 'english', - 'et' => 'estonian', - 'fi' => 'finnish', - 'fr' => 'french', - 'de' => 'german', - 'el' => 'greek', - 'he' => 'hebrew', - 'hi' => 'hindi', - 'hu' => 'hungarian', - 'it' => 'italian', - 'ja' => 'japanese', - 'fa' => 'persian', - 'lb' => 'luxembourgish', - 'mr' => 'marathi', - 'pl' => 'polish', - 'pt' => 'portuguese', - 'ro' => 'romanian', - 'ru' => 'russian', - 'rs' => 'serbian', - 'sk' => 'slovak', - 'es' => 'spanish', - 'sv' => 'swedish', - 'tr' => 'turkish' + // 'en' => 'english', + 'tr' => 'turkish', ]; $config['language_codes'] = $languages; @@ -141,37 +112,7 @@ $config['language_code'] = array_search($config['language'], $languages) ?: 'en' | */ $config['available_languages'] = [ - 'arabic', - 'bulgarian', - 'catalan', - 'chinese', - 'croatian', - 'czech', - 'danish', - 'dutch', 'english', - 'estonian', - 'finnish', - 'french', - 'german', - 'greek', - 'hebrew', - 'hindi', - 'hungarian', - 'italian', - 'japanese', - 'luxembourgish', - 'marathi', - 'persian', - 'polish', - 'portuguese', - 'portuguese-br', - 'romanian', - 'russian', - 'serbian', - 'slovak', - 'spanish', - 'swedish', 'turkish' ]; diff --git a/application/core/EA_Controller.php b/application/core/EA_Controller.php index 831050a5..32cd9014 100644 --- a/application/core/EA_Controller.php +++ b/application/core/EA_Controller.php @@ -122,6 +122,7 @@ class EA_Controller extends CI_Controller } $this->lang->load('translations'); + $this->lang->load('iflrandevu/translations'); } /** diff --git a/application/helpers/iflrandevu/branding_helper.php b/application/helpers/iflrandevu/branding_helper.php new file mode 100644 index 00000000..b33dbd20 --- /dev/null +++ b/application/helpers/iflrandevu/branding_helper.php @@ -0,0 +1,86 @@ + "İFL Randevu", + "description" => "İzmir Fen Lisesi Randevu Portalı", + "maintainers" => "Aliberk Sandıkçı & Alex Tselegidis", // to also give credit to original maintainer + "maintainer_nickname" => "asandikci", + "maintainer_name" => "Aliberk Sandıkçı", + "maintainer_website" => "https://asandikci.com/", + "license" => "GPL3.0", + "website" => "https://iflpanel.com/about/iflrandevu", + "example" => "https://randevu.iflpanel.com/", + "source" => "https://git.aliberksandikci.com.tr/ifl/iflrandevu", + "issues" => "https://git.aliberksandikci.com.tr/ifl/iflrandevu/issues" + ); + + // Upstream Yazılım Sağlayıcı Bilgileri + $upstream = array ( + "name" => "Easy!Appointments", + "description" => "Self Hosted Appointment Scheduler ", + "maintainer_nickname" => "alextselegidis", + "maintainer_name" => "Alex Tselegidis", + "maintainer_website" => "https://alextselegidis.com", + "license" => "GPL3.0", + "website" => "https://easyappointments.org", + "example" => "https://demo.easyappointments.org/", + "source" => "https://github.com/alextselegidis/easyappointments", + "issues" => "https://github.com/alextselegidis/easyappointments/issues", + ); + + + switch ($product) { + case 'software': + return $software[$type]; + break; + case 'type': + return $upstream[$type]; + break; + } + } +} diff --git a/application/language/arabic/calendar_lang.php b/application/language/arabic/calendar_lang.php deleted file mode 100644 index a60659fa..00000000 --- a/application/language/arabic/calendar_lang.php +++ /dev/null @@ -1,84 +0,0 @@ - -
-الوصول هنا غير مصرح به.
- - -