Skip to content
Permalink
Browse files

added some English help pages; updates #163

  • Loading branch information...
following5 committed Jul 9, 2015
1 parent 6cd3af5 commit 61979337fb28d88c4b5d291c15f1cc9bb5c5467a
@@ -107,6 +107,7 @@
$opt['locale']['EN']['page']['subtitle2'] = '';
$opt['locale']['EN']['page']['license_url'] = 'http://creativecommons.org/licenses/by-nc-nd/3.0/de/deed.en';
$opt['locale']['EN']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons License Terms" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/de/88x31.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">The Opencaching.de <a href="articles.php?page=impressum#datalicense">content</a> is licensed under Creative Commons <a rel="license" href="%1" target="_blank">BY-BC-ND 3.0 DE</a>.</div>';
$opt['locale']['EN']['helpwiki'] = "http://wiki.opencaching.de/index.php/";
$opt['locale']['DE']['format']['dm'] = '%d.%m.';
$opt['locale']['DE']['format']['dateshort'] = '%d.%m.%y';
@@ -190,6 +190,7 @@
*/
$opt['template']['default']['locale'] = 'DE'; // may be overwritten by $opt['domain'][...]['locale']
$opt['template']['default']['article_locale'] = 'EN'; // may be overwritten by $opt['domain'][...]['article_locale']
$opt['template']['default']['fallback_locale'] = 'EN'; // may be overwritten by $opt['domain'][...]['article_locale']
$opt['template']['default']['style'] = 'ocstyle'; // may be overwritten by $opt['domain'][...]['style']
$opt['template']['default']['country'] = 'DE'; // may be overwritten by $opt['domain'][...]['country']
@@ -531,6 +531,7 @@ INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('editlog', 'D
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('error', 'DE', 'Fehlermeldungen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('log_cache', 'DE', 'Das Onlinelog');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('login', 'DE', 'Login');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('login', 'EN', 'How to log in at the Opencaching website');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('mailto', 'DE', 'Benutzerprofil#Emailversand');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('*map2', 'DE', 'Cachekarte');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('mydetails', 'DE', 'Benutzerprofil#Einstellungen');
@@ -551,6 +552,7 @@ INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('picture', 'D
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('previewpics', 'DE', 'Vorschaubilder');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('query', 'DE', 'Gespeicherte Suchen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('register', 'DE', 'Registrierung');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('register', 'EN', 'How to register at the Opencaching website');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('removelog_logowner', 'DE', 'Logeintrag löschen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('removelog_cacheowner', 'DE', 'Logeintrag löschen');
INSERT INTO `helppages` (`ocpage`, `language`, `helppage`) VALUES ('reportcache', 'DE', 'Cache melden');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('954', 'EN', 'Default', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('957', 'EN', 'Chat/IRC', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1059', 'EN', 'An account with that username already exists.', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'EN', 'Opencaching-Wiki', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1060', 'EN', 'Opencaching Wiki', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1061', 'EN', 'Terms of use and legal information', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1062', 'EN', 'Page performance', '2010-08-28 11:48:08');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('1063', 'EN', 'Page creation', '2010-08-28 11:48:08');
@@ -365,13 +365,23 @@ function helppagelink($ocpage, $title='Instructions')
{
global $opt, $translate;
$help_locale = $opt['template']['locale'];
$helppage = sql_value("SELECT `helppage` FROM `helppages`
WHERE `ocpage`='&1' AND `language`='&2'",
"", $ocpage, $opt['template']['locale']);
if ($helppage == "")
"", $ocpage, $help_locale);
if ($helppage == "")
$helppage = sql_value("SELECT `helppage` FROM `helppages`
WHERE `ocpage`='&1' AND `language`='*'",
"", $ocpage);
if ($helppage == "")
{
$helppage = sql_value("SELECT `helppage` FROM `helppages`
WHERE `ocpage`='&1' AND `language`='&2'",
"", $ocpage, $opt['template']['default']['fallback_locale']);
if ($helppage != "")
$help_locale = $opt['template']['default']['fallback_locale'];
}
if ($helppage == "" && isset($opt['locale'][$opt['template']['locale']]['help'][$ocpage]))
$helppage = $opt['locale'][$opt['template']['locale']]['help'][$ocpage];
@@ -381,8 +391,8 @@ function helppagelink($ocpage, $title='Instructions')
if (substr($helppage,0,1) == "!")
return "<a class='nooutline' href='" . substr($helppage,1) . "' " . $imgtitle . " target='_blank'>";
else
if ($helppage != "" && isset($opt['locale'][$opt['template']['locale']]['helpwiki']))
return "<a class='nooutline' href='" . $opt['locale'][$opt['template']['locale']]['helpwiki'] .
if ($helppage != "" && isset($opt['locale'][$help_locale]['helpwiki']))
return "<a class='nooutline' href='" . $opt['locale'][$help_locale]['helpwiki'] .
str_replace(' ','_',$helppage) . "' " . $imgtitle . " target='_blank'>";
return "";
@@ -66,6 +66,7 @@
$tpl->assign('username', $username);
$tpl->assign('error', $retval);
}
$tpl->assign('loginhelplink', helppagelink('login'));
$tpl->assign('target', $target);
$tpl->display();
@@ -72,7 +72,7 @@
{t}Forgotten your E-Mail-Address?{/t} <a href="remindemail.php">{t}Remind me{/t}</a><br />
</p>
<p>
{t}Here you can find more troubleshooting:{/t} <a href="http://wiki.opencaching.de/index.php/Login_auf_Opencaching.de" target="_blank">{t}Problems with login{/t}</a>.
{t}Here you can find more troubleshooting:{/t} {$loginhelplink}{t}Problems with login{/t}</a>.
</p>
<div class="buffer" style="width: 500px;">&nbsp;</div>
</div>

0 comments on commit 6197933

Please sign in to comment.
You can’t perform that action at this time.