Keyman for Android is also available on the Play Store.
@@ -92,7 +92,7 @@ Swift 4.0 app.Keyman Developer 10 allows you to create diff --git a/_content/11/index.php b/_content/11/index.php index 311ee8e3..1482d7ac 100644 --- a/_content/11/index.php +++ b/_content/11/index.php @@ -52,7 +52,7 @@
- %s', _m_Downloads('downloads_pre_release_page')), sprintf('%s', _m_Downloads('downloads_old_versions_page')) ) ?>
diff --git a/_content/downloads/pre-release/index.php b/_content/downloads/pre-release/index.php index 12a0ba2f..9151024e 100644 --- a/_content/downloads/pre-release/index.php +++ b/_content/downloads/pre-release/index.php @@ -6,8 +6,6 @@ use Keyman\Site\com\keyman\Locale; Locale::definePageScope('LOCALE_DOWNLOADS', 'downloads'); - $_m_Downloads = function($id, ...$args) { return Locale::m(LOCALE_DOWNLOADS, $id, ...$args); }; - function _m_Downloads($id, ...$args) { return Locale::m(LOCALE_DOWNLOADS, $id, ...$args); } // Required head([ diff --git a/_content/downloads/releases/_version_downloads.php b/_content/downloads/releases/_version_downloads.php index b2ab39de..a6b56f1d 100644 --- a/_content/downloads/releases/_version_downloads.php +++ b/_content/downloads/releases/_version_downloads.php @@ -7,8 +7,6 @@ use Keyman\Site\com\keyman\Locale; Locale::definePageScope('LOCALE_DOWNLOADS', 'downloads'); - $_m_Downloads = function($id, ...$args) { return Locale::m(LOCALE_DOWNLOADS, $id, ...$args); }; - function _m_Downloads($id, ...$args) { return Locale::m(LOCALE_DOWNLOADS, $id, ...$args); } if(!isset($_REQUEST['version'])) { echo "version parameter is required."; diff --git a/_content/keyboards/index.php b/_content/keyboards/index.php index 3f3675f2..f5c37eb2 100644 --- a/_content/keyboards/index.php +++ b/_content/keyboards/index.php @@ -10,12 +10,10 @@ use Keyman\Site\com\keyman\Locale; Locale::definePageScope('LOCALE_KEYBOARDS', 'keyboards'); - $_m = function($id, ...$args) { return Locale::m(LOCALE_KEYBOARDS, $id, ...$args); }; - function _m($id, ...$args) { return Locale::m(LOCALE_KEYBOARDS, $id, ...$args); } $head_options = [ - 'title' => _m('page_title'), - 'description' => _m('page_description'), + 'title' => _m_Keyboards('page_title'), + 'description' => _m_Keyboards('page_description'), 'css' => [Util::cdn('css/template.css'), Util::cdn('keyboard-search/search.css')], 'js' => [ Util::cdn('keyboard-search/jquery.mark.js'), @@ -62,14 +60,14 @@ function _m($id, ...$args) { return Locale::m(LOCALE_KEYBOARDS, $id, ...$args @@ -206,7 +200,7 @@ protected static function WritemacOSBoxes() { } protected static function WriteLinuxBoxes() { - global $_m; + global $_m_Keyboards_Install; $keyboard = self::$keyboard; $tier = self::$tier; @@ -244,19 +238,19 @@ protected static function WriteLinuxBoxes() { startAfterPageLoad_Linux(document.currentScript.dataset);{$_m('platform_not_installed', 'Keyman for Linux')}
+{$_m_Keyboards_Install('platform_not_installed', 'Keyman for Linux')}
{$_m('with_play_store', $h['name'])}
- {$_m('install_from_play_store')} -{$_m_Keyboards_Install('with_play_store', $h['name'])}
+ {$_m_Keyboards_Install('install_from_play_store')} +{$_m('already_installed')} {$_m('download_just_keyboard')} {$_m('and_then_install_in_the_app')}
+{$_m_Keyboards_Install('already_installed')} {$_m_Keyboards_Install('download_just_keyboard')} {$_m_Keyboards_Install('and_then_install_in_the_app')}
{$_m('platform_not_installed', 'Keyman for iPhone and iPad')}
+{$_m_Keyboards_Install('platform_not_installed', 'Keyman for iPhone and iPad')}
,
+,
- + - + - \ No newline at end of file + \ No newline at end of file diff --git a/_includes/includes/ui/downloads.php b/_includes/includes/ui/downloads.php index aaed54cf..b572c71b 100644 --- a/_includes/includes/ui/downloads.php +++ b/_includes/includes/ui/downloads.php @@ -2,6 +2,8 @@ require_once _KEYMANCOM_INCLUDES . '/autoload.php'; use Keyman\Site\Common\KeymanHosts; + use Keyman\Site\com\keyman\Locale; + Locale::definePageScope('LOCALE_DOWNLOADS', 'downloads'); $versions = @json_decode(file_get_contents(KeymanHosts::Instance()->SERVER_downloads_keyman_com . '/api/version/2.0')); //if($versions === NULL || $versions === FALSE) { @@ -29,7 +31,7 @@ function formatSizeUnits($bytes) { function downloadSection($product, $platform, $filepattern, $tiers = '', $target = '') { if($target == '') $target = $platform; - echo sprintf("" . - $_m_KeyboardDetails("view_obsolete_details") . "
+ $_m_Keyboards_Details("view_obsolete_details") . "minKeymanVersion) ?>
+minKeymanVersion) ?>
- +| + | |||
|---|---|---|---|
| + | |||
| + | |||
| + | |||
| + | helpLink)) { ?> - href='helpLink ?>'> + href='helpLink ?>'> | ||
| + | sourcePath) && preg_match('/^(release|experimental)\//', self::$keyboard->sourcePath)) { @@ -579,15 +573,15 @@ protected static function WriteKeyboardDetails() { href='sourcePath) ?>'>sourcePath) ?> | ||
| + | version) ?> | ||
| + | |||
| + | id ?>.kmp | ||
| + | |||
| - | + | + | |
| + | |||
| + | |||
| + | related as $name => $value) { @@ -638,17 +632,17 @@ protected static function WriteKeyboardDetails() { $s = @file_get_contents(KeymanHosts::Instance()->SERVER_api_keyman_com.'/keyboard/' . rawurlencode($name)); if ($s === FALSE) { echo "$hname "; } else { echo "$hname "; } if (isset($value->deprecates) && $value->deprecates) { - echo $_m_KeyboardDetails("deprecated"); + echo $_m_Keyboards_Details("deprecated"); } if (isset($value->deprecatedBy) && $value->deprecatedBy) { - echo $_m_KeyboardDetails("new_version"); + echo $_m_Keyboards_Details("new_version"); } } ?> @@ -656,11 +650,11 @@ protected static function WriteKeyboardDetails() { | ||
| + | languages)) - 3; @@ -672,9 +666,9 @@ protected static function WriteKeyboardDetails() { foreach($langs as $bcp47 => $detail) { if($n == 3) { echo " " . - $_m_KeyboardDetails("expand_more", $count) . ""; + $_m_Keyboards_Details("expand_more", $count) . ""; echo "" . - $_m_KeyboardDetails("collapse") . " |