kc9uhi/wavelog
3
0
Fork 1
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-27 01:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gettext_pr1' into gettext_pr2

Browse Source
This commit is contained in:
HB9HIL
2024-06-06 22:26:55 +02:00
parent 8c6e7347ee 8bd573b3da
commit 917830690c
5 changed files with 167 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
application/config/gettext.php
View File

@@ -4,7 +4,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
* Gettext library config
* @package CodeIgniter\CI-Gettext
* @category Configuration
* @author Kader Bouyakoub <bkader@mail.com>
* @author Kader Bouyakoub <bkader@mail.com>
* MODIFIED BY Fabian Berg <mail@hb9hil.org>
* @link http://www.bkader.com/
*/
@@ -53,14 +53,158 @@ $config['gettext_domain'] = NULL;
| A list of enabled languages. These are the language that will be
| used on the site.
*/
$config['gettext_languages'] = array(
'arabic',
'english',
'french',
'german',
'italian',
'portuguese',
'spanish',
$config['languages'] = array(
'bulgarian' => array(
'name' => 'Български',
'name_en' => 'Bulgarian',
'folder' => 'bulgarian',
'locale' => 'bg-BG',
'gettext' => 'bg_BG',
'direction' => 'ltr',
'code' => 'bg',
'flag' => 'bg',
),
'chinese_simplified' => array(
'name' => '中文（简体）',
'name_en' => 'Chinese (Simplified)',
'folder' => 'chinese_simplified',
'locale' => 'zh-CN',
'gettext' => 'zh_CN',
'direction' => 'ltr',
'code' => 'zh-Hans',
'flag' => 'cn',
),
'czech' => array(
'name' => 'Čeština',
'name_en' => 'Czech',
'folder' => 'czech',
'locale' => 'cs-CZ',
'gettext' => 'cs_CZ',
'direction' => 'ltr',
'code' => 'cs',
'flag' => 'cz',
),
'dutch' => array(
'name' => 'Nederlands',
'name_en' => 'Dutch',
'folder' => 'dutch',
'locale' => 'nl-NL',
'gettext' => 'nl_NL',
'direction' => 'ltr',
'code' => 'nl',
'flag' => 'nl',
),
'english' => array(
'name' => 'English',
'name_en' => 'English',
'folder' => 'english',
'locale' => 'en-US',
'gettext' => 'en_US',
'direction' => 'ltr',
'code' => 'en',
'flag' => 'us',
),
'finnish' => array(
'name' => 'Suomi',
'name_en' => 'Finnish',
'folder' => 'finnish',
'locale' => 'fi-FI',
'gettext' => 'fi_FI',
'direction' => 'ltr',
'code' => 'fi',
'flag' => 'fi',
),
'french' => array(
'name' => 'Français',
'name_en' => 'French',
'folder' => 'french',
'locale' => 'fr-FR',
'gettext' => 'fr_FR',
'direction' => 'ltr',
'code' => 'fr',
'flag' => 'fr',
),
'german' => array(
'name' => 'Deutsch',
'name_en' => 'German',
'folder' => 'german',
'locale' => 'de-DE',
'gettext' => 'de_DE',
'direction' => 'ltr',
'code' => 'de',
'flag' => 'de',
),
'greek' => array(
'name' => 'Ελληνικά',
'name_en' => 'Greek',
'folder' => 'greek',
'locale' => 'el-GR',
'gettext' => 'el_GR',
'direction' => 'ltr',
'code' => 'el',
'flag' => 'gr',
),
'italian' => array(
'name' => 'Italiano',
'name_en' => 'Italian',
'folder' => 'italian',
'locale' => 'it-IT',
'gettext' => 'it_IT',
'direction' => 'ltr',
'code' => 'it',
'flag' => 'it',
),
'polish' => array(
'name' => 'Polski',
'name_en' => 'Polish',
'folder' => 'polish',
'locale' => 'pl-PL',
'gettext' => 'pl_PL',
'direction' => 'ltr',
'code' => 'pl',
'flag' => 'pl',
),
'russian' => array(
'name' => 'Русский',
'name_en' => 'Russian',
'folder' => 'russian',
'locale' => 'ru-RU',
'gettext' => 'ru_RU',
'direction' => 'ltr',
'code' => 'ru',
'flag' => 'ru',
),
'spanish' => array(
'name' => 'Español',
'name_en' => 'Spanish',
'folder' => 'spanish',
'locale' => 'es-ES',
'gettext' => 'es_ES',
'direction' => 'ltr',
'code' => 'es',
'flag' => 'es',
),
'swedish' => array(
'name' => 'Svenska',
'name_en' => 'Swedish',
'folder' => 'swedish',
'locale' => 'sv-SE',
'gettext' => 'sv_SE',
'direction' => 'ltr',
'code' => 'sv',
'flag' => 'se',
),
'turkish' => array(
'name' => 'Türkçe',
'name_en' => 'Turkish',
'folder' => 'turkish',
'locale' => 'tr-TR',
'gettext' => 'tr_TR',
'direction' => 'ltr',
'code' => 'tr',
'flag' => 'tr',
)
);
/*

11
application/hooks/gettext/Gettext.php
View File

@@ -190,8 +190,8 @@ class Gettext
return $this->languages;
}
include __DIR__.'/vendor/languages.php';
$this->languages = $languages;
$this->languages = $this->config['languages'];
return $this->languages;
}
@@ -210,11 +210,10 @@ class Gettext
}
// Cache them before returning.
$this->site_languages = array_intersect_key(
$this->_get_languages(),
array_flip($this->config['languages'])
);
$this->site_languages = $this->config['languages'];
return $this->site_languages;
}
/**

93
application/hooks/gettext/vendor/languages.php vendored
View File

@@ -1,93 +0,0 @@
<?php
defined('BASEPATH') OR exit('No direct script access allowed');
$languages = array(
// Arabic
'arabic' => array(
'name' => 'العربية',
'name_en' => 'Arabic',
'folder' => 'arabic',
'locale' => 'ar-DZ',
'gettext' => 'ar_DZ',
'direction' => 'rtl',
'code' => 'ar',
'flag' => 'dz',
),
// English
'english' => array(
'name' => 'English',
'name_en' => 'English',
'folder' => 'english',
'locale' => 'en-US',
'gettext' => 'en_US',
'direction' => 'ltr',
'code' => 'en',
'flag' => 'us',
),
// French
'french' => array(
'name' => 'Français',
'name_en' => 'French',
'folder' => 'french',
'locale' => 'fr-FR',
'gettext' => 'fr_FR',
'direction' => 'ltr',
'code' => 'fr',
'flag' => 'fr',
),
// German
'german' => array(
'name' => 'Deutsch',
'name_en' => 'German',
'folder' => 'german',
'locale' => 'de-DE',
'gettext' => 'de_DE',
'direction' => 'ltr',
'code' => 'de',
'flag' => 'de',
),
// Italian
'italian' => array(
'name' => 'Italiano',
'name_en' => 'Italian',
'folder' => 'italian',
'locale' => 'it-IT',
'gettext' => 'it_IT',
'direction' => 'ltr',
'code' => 'it',
'flag' => 'it',
),
// Portuguese
'portuguese' => array(
'name' => 'Português',
'name_en' => 'Portuguese',
'folder' => 'portuguese',
'locale' => 'pt-PT',
'gettext' => 'pt_PT',
'direction' => 'ltr',
'code' => 'pt',
'flag' => 'pt',
),
// Spanish
'spanish' => array(
'name' => 'Español',
'name_en' => 'Spanish',
'folder' => 'spanish',
'locale' => 'es-ES',
'gettext' => 'es_ES',
'direction' => 'ltr',
'code' => 'es',
'flag' => 'es',
),
);
/* End of file languages.php */
/* Location: ./application/hooks/gettext/vendor/languages.php */

8
application/hooks/gettext/vendor/php-gettext/gettext.php vendored
View File

@@ -138,13 +138,19 @@ function _get_reader($domain = null, $category = 5, $enable_cache = true)
$locale_names = get_list_of_locales($locale);
$input = null;
foreach($locale_names as $locale) {
$is_en = false;
if (strpos($locale, 'en') === 0) {
$is_en = true;
}
$full_path = APPPATH . "locale/" . $locale . "/" . $subpath; // we need so set a fix path here, to match our folder structure
// log_message('error', 'full path: '. $full_path);
if (file_exists($full_path)) {
$input = new FileReader($full_path);
break;
} else {
log_message('error', "Language Path does not exist. _get_reader() in gettext.php");
if(!$is_en) {
log_message('error', "Language Path '". $locale ."' does not exist. _get_reader() in gettext.php");
}
}
}

3
application/models/Clublog_model.php
View File

@@ -158,8 +158,9 @@ class Clublog_model extends CI_Model
if (curl_errno($request)) {
$return = curl_error($request);
} elseif (preg_match_all('/Login rejected/', $response)) {
$this->disable_sync4call($station_row->station_callsign, $station_row->station_ids);
$return = "Wrong Clublog username and password for Callsign: '" . $station_row->station_callsign . "'. 'LOGIN REJECTED'.";
log_message('error', $return);
log_message('debug', $return);
} elseif (preg_match_all('/Invalid callsign/', $response)) { // We're trying to download calls for a station we're not granted. Disable Clublog-Transfer for that station(s)
$this->disable_sync4call($station_row->station_callsign, $station_row->station_ids);
$return = "The callsign '" . $station_row->station_callsign . "' does not match the user account at Clublog. 'INVALID CALLSIGN'.";