Skip to content

Commit

Permalink
Fixed Help and Rescue Pages for multiple languages
Browse files Browse the repository at this point in the history 
For #1025. Home, Help, and Rescue links now pass current language information. Removed '_list" from rescue language list.
  • Loading branch information
@eSilverStrike
eSilverStrike committed Jan 24, 2020
1 parent 1b94cd3 commit 8bf13ed
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 23 deletions.
2 changes: 1 addition & 1 deletion public_html/admin/install/language/chinese_simplified_utf-8.php
View file
Expand Up @@ -372,7 +372,7 @@

$LANG_HELP = array(
0 => 'Geeklog Installation Help',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a>.</p>',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site, please review the <a href="/docs/english/install.html">Geeklog Installation Docs</a>. For any addtional questions or problems you may have, please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a> to read up on similar issues and post your own topic.</p>',
'site_name' => '你的网站名.',
'site_slogan' => '简单的描述你的网站.',
'db_type' => 'Geeklog can be installed using either a MySQL or PostgreSQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
Expand Down
2 changes: 1 addition & 1 deletion public_html/admin/install/language/chinese_traditional_utf-8.php
View file
Expand Up @@ -372,7 +372,7 @@

$LANG_HELP = array(
0 => 'Geeklog Installation Help',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a>.</p>',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site, please review the <a href="/docs/english/install.html">Geeklog Installation Docs</a>. For any addtional questions or problems you may have, please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a> to read up on similar issues and post your own topic.</p>',
'site_name' => '你的網站名.',
'site_slogan' => '簡單的描述你的網站.',
'db_type' => 'Geeklog can be installed using either a MySQL or PostgreSQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
Expand Down
2 changes: 1 addition & 1 deletion public_html/admin/install/language/english.php
View file
Expand Up @@ -377,7 +377,7 @@

$LANG_HELP = array(
0 => 'Geeklog Installation Help',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a>.</p>',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site, please review the <a href="/docs/english/install.html">Geeklog Installation Docs</a>. For any addtional questions or problems you may have, please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a> to read up on similar issues and post your own topic.</p>',
'site_name' => 'The name of your website.',
'site_slogan' => 'A simple description of your website.',
'db_type' => 'Geeklog can be installed using either a MySQL or PostgreSQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
Expand Down
2 changes: 1 addition & 1 deletion public_html/admin/install/language/english_utf-8.php
View file
Expand Up @@ -377,7 +377,7 @@

$LANG_HELP = array(
0 => 'Geeklog Installation Help',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a>.</p>',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site, please review the <a href="/docs/english/install.html">Geeklog Installation Docs</a>. For any addtional questions or problems you may have, please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a> to read up on similar issues and post your own topic.</p>',
'site_name' => 'The name of your website.',
'site_slogan' => 'A simple description of your website.',
'db_type' => 'Geeklog can be installed using either a MySQL or PostgreSQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
Expand Down
2 changes: 1 addition & 1 deletion public_html/admin/install/language/german_utf-8.php
View file
Expand Up @@ -371,7 +371,7 @@

$LANG_HELP = array(
0 => 'Geeklog Installation Help',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a>.</p>',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site, please review the <a href="/docs/english/install.html">Geeklog Installation Docs</a>. For any addtional questions or problems you may have, please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a> to read up on similar issues and post your own topic.</p>',
'site_name' => 'Der Name Deiner Website.',
'site_slogan' => 'Ein Motto oder eine kurze Beschreibung Deiner Website.',
'db_type' => 'Geeklog can be installed using either a MySQL or PostgreSQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
Expand Down
2 changes: 1 addition & 1 deletion public_html/admin/install/language/hebrew_utf-8.php
View file
Expand Up @@ -365,7 +365,7 @@

$LANG_HELP = array(
0 => 'Geeklog Installation Help',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a>.</p>',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site, please review the <a href="/docs/english/install.html">Geeklog Installation Docs</a>. For any addtional questions or problems you may have, please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a> to read up on similar issues and post your own topic.</p>',
'site_name' => 'שם האתר שלכם.',
'site_slogan' => 'תיאור פשוט של האתר שלכם.',
'db_type' => 'Geeklog can be installed using either a MySQL or PostgreSQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
Expand Down
2 changes: 1 addition & 1 deletion public_html/admin/install/language/japanese_utf-8.php
View file
Expand Up @@ -373,7 +373,7 @@

$LANG_HELP = array(
0 => 'Geeklog Installation Help',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a>.</p>',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site, please review the <a href="/docs/japanese/install.html">Geeklog Installation Docs</a>. For any addtional questions or problems you may have, please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a> to read up on similar issues and post your own topic.</p>',
'site_name' => 'サイト名を入力します。後から変更することもできます。',
'site_slogan' => 'サイトのスローガンを入力します。後から変更することもできます。',
'db_type' => 'Geeklog can be installed using either a MySQL or PostgreSQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
Expand Down
2 changes: 1 addition & 1 deletion public_html/admin/install/language/polish_utf-8.php
View file
Expand Up @@ -371,7 +371,7 @@

$LANG_HELP = array(
0 => 'Geeklog Installation Help',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a>.</p>',
'description' => '<p>This help page explains what each field means that you may be asked to input for new Geeklog installs and mirgating your Geeklog site to a new domain.</p><p>If you run into problems with installing, upgrading, or migrating your Geeklog site, please review the <a href="/docs/english/install.html">Geeklog Installation Docs</a>. For any addtional questions or problems you may have, please visit the <a href="https://www.geeklog.net/forum/index.php?forum=1">Geeklog Install Support Forum</a> to read up on similar issues and post your own topic.</p>',
'site_name' => 'Nazwa Twojej Strony.',
'site_slogan' => 'Prosty opis Twojej strony.',
'db_type' => 'Geeklog can be installed using either a MySQL or PostgreSQL database. If you are not sure which option to select contact your hosting provider.<br><br><strong>Note</strong> InnoDB Tables may improve performance on (very) large sites, but they also make database backups more complicated.',
Expand Down
12 changes: 6 additions & 6 deletions public_html/admin/install/layout/index.thtml
View file
Expand Up @@ -24,10 +24,10 @@

<div class="uk-navbar-right">
<ul class="uk-navbar-nav uk-visible@s">
<li><a href="index.php">{{ LANG.INSTALL.121 }}</a></li>
<li><a href="rescue.php">{{ LANG.INSTALL.109 }}</a></li>
<li><a href="index.php?language={{ language }}">{{ LANG.INSTALL.121 }}</a></li>
<li><a href="rescue.php?lang={{ language }}">{{ LANG.INSTALL.109 }}</a></li>
<li><a href="{{ LANG.INSTALL.87 }}">{{ LANG.INSTALL.1 }}</a></li>
<li><a href="help.php">{{ LANG.INSTALL.122 }}</a></li>
<li><a href="help.php?language={{ language }}">{{ LANG.INSTALL.122 }}</a></li>
<li class="{{ language_selector_menu }}"><a href="#modal-language" uk-toggle>{{ LANG.INSTALL.118 }}</a></li>
</ul>
<ul class="uk-navbar-nav uk-hidden@s">
Expand All @@ -44,10 +44,10 @@
<div class="uk-offcanvas-bar uk-offcanvas-bar-animation uk-offcanvas-slide">
<button class="uk-offcanvas-close uk-close uk-icon" type="button" data-uk-close></button>
<ul class="uk-nav uk-nav-default">
<li><a href="index.php">{{ LANG.INSTALL.121 }}</a></li>
<li><a href="rescue.php">{{ LANG.INSTALL.109 }}</a></li>
<li><a href="index.php?language={{ language }}">{{ LANG.INSTALL.121 }}</a></li>
<li><a href="rescue.php?lang={{ language }}">{{ LANG.INSTALL.109 }}</a></li>
<li><a href="{{ LANG.INSTALL.87 }}">{{ LANG.INSTALL.1 }}</a></li>
<li><a href="help.php">{{ LANG.INSTALL.122 }}</a></li>
<li><a href="help.php?language={{ language }}">{{ LANG.INSTALL.122 }}</a></li>
<li class="{{ language_selector_menu }}"><a href="#modal-language" uk-toggle>{{ LANG.INSTALL.118 }}</a></li>
</ul>
</div>
Expand Down
20 changes: 11 additions & 9 deletions public_html/admin/install/rescue.php
View file
Expand Up @@ -114,10 +114,12 @@ function langSelector() {

if ($files !== FALSE) {
foreach ($files as $file) {
$file = str_replace('.php', '', basename($file));
$selected = ($file === $lang) ? ' selected="selected"' : '';
$retval .= '<option value="' . $file . '"' . $selected . '>'
. $file . '</option>' . LB;
if (basename($file) != '_list.php') {
$file = str_replace('.php', '', basename($file));
$selected = ($file === $lang) ? ' selected="selected"' : '';
$retval .= '<option value="' . $file . '"' . $selected . '>'
. $file . '</option>' . LB;
}
}
}

Expand Down Expand Up @@ -164,7 +166,7 @@ function render($renderType, $args = array()) {
<div class="main center">
<div class="header-navigation-container">
<div class="header-navigation-line">
<a href="index.php" class="header-navigation"><?php e(2); ?></a>&nbsp;&nbsp;&nbsp;<?php echo langSelector(); ?>&nbsp;&nbsp;
<a href="index.php?language=<?php echo $lang; ?>" class="header-navigation"><?php e(2); ?></a>&nbsp;&nbsp;&nbsp;<?php echo langSelector(); ?>&nbsp;&nbsp;
</div>
</div>
<h1><?php e(3); ?></h1>
Expand Down Expand Up @@ -280,7 +282,7 @@ function fatal_handler() {

$error = error_get_last();
//check if it's a core/fatal error, otherwise it's a normal shutdown
if ($error !== NULL) {
if ($error !== NULL) {
?>
<div class="box error">
<p><?php e(45); ?></p>
Expand All @@ -291,7 +293,7 @@ function fatal_handler() {
<?php
die;
}
}
}
register_shutdown_function( "fatal_handler" );

// Check if `conf_values` table exists
Expand All @@ -307,8 +309,8 @@ function fatal_handler() {
}
// ********************************************************
?>


<h2><?php e(29); ?></h2>
<p style="margin-left:5px;"><?php e(30); ?></p>
<ul class="option">
Expand Down

0 comments on commit 8bf13ed

Please sign in to comment.