Skip to content
Permalink
Browse files

improved messages for scheduled geocache publish; updates #1063

  • Loading branch information...
following5 committed Aug 26, 2017
1 parent 49b691a commit acabd4523c8b1635ad5ec41dfb82ea41a9610c28
@@ -12,8 +12,16 @@
</div>
{elseif $cache.status==5}
<div class="isannotated">
{if $date_activate}
<p style="margin-bottom:0">{t 1=$date_activate|date_format:$opt.format.datelong 2=$date_activate|date_format:$opt.format.time}This geocache will be published on <b>%1</b> at <b>%2</b>.{/t}</p>
{if $publish_date}
<p style="margin-bottom:0">
{if $publish_in_days <= 0}
{t 1=$publish_date|date_format:$opt.format.time}This geocache will be published today at <b>%1</b>.{/t}
{elseif $publish_in_days == 1}
{t 1=$publish_date|date_format:$opt.format.time}This geocache will be published <b>tomorrow</b> at <b>%1</b>.{/t}
{else}
{t 1=$publish_in_days 2=$publish_date|date_format:$opt.format.datelong 3=$publish_date|date_format:$opt.format.time}This geocache will be published <b>in %1 days</b> (%2) at <b>%3</b>.{/t}
{/if}
</p>
{else}
<p><strong>{t}This Geocache has not been published yet.{/t}</strong></p>
<p>{t 1="href='articles.php?page=cacheinfo' target='_blank'" 2=$cache.cacheid}Please verify that the geocache description is complete and all properties and attributes are set properly, according to the <a %1>instructions</a>. Then click <strong><a href="editcache.php?cacheid=%2&publish=now#others">here</a></strong> and "Save" to publish your geocache.{/t}
@@ -124,7 +124,8 @@ function getChildWaypoints($cacheid)
`caches`.`protect_old_coords` OR `user`.`is_active_flag`=0 AS `protect_old_coords`,
`caches`.`needs_maintenance`,
`caches`.`listing_outdated`,
`caches`.`date_activate`,
`caches`.`date_activate` AS `publish_date`,
DATEDIFF(DATE(`caches`.`date_activate`), DATE(NOW())) AS `publish_in_days`,
`cache_desc`.`language` AS `desclanguage`,
`cache_desc`.`short_desc` AS `shortdesc`,
`cache_desc`.`desc` AS `desc`,
@@ -489,7 +490,9 @@ function getChildWaypoints($cacheid)
$tpl->assign('listing_admin', $login->listingAdmin());
$tpl->assign('npahelplink', helppagelink('npa'));
$tpl->assign('desclang', $desclang);
$tpl->assign('date_activate', $rCache['date_activate']);
$tpl->assign('publish_date', $rCache['publish_date']);
$tpl->assign('publish_in_days', $rCache['publish_in_days']);
// display the page
$tpl->display();
@@ -1935,6 +1935,8 @@ INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2635', 'Close',
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2636', 'This website uses cookies. If you stay on this site you accept the usage of cookies.', '2017-05-14 21:00:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2637', 'This Geocache has not been published yet.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2638', 'Please verify that the geocache description is complete and all properties and attributes are set properly, according to the <a %1>instructions</a>. Then click <strong><a href=\"editcache.php?cacheid=%2&publish=now#others\">here</a></strong> and \"Save\" to publish your geocache.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2639', 'This geocache will be published on <b>%1</b> at <b>%2</b>.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2640', 'Do you really want to delete the picture \\\'{title}\\\'?', '2017-08-22 18:45:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2641', 'There is already a report in progress for this cache, see below.', '2017-08-23 13:20:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2650', 'This geocache will be published today at <b>%1</b>.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2651', 'This geocache will be published <b>tomorrow</b> at <b>%1</b>.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans` (`id`, `text`, `last_modified`) VALUES ('2652', 'This geocache will be published <b>in %1 days</b> (%2) at <b>%3</b>.', '2017-08-20 19:30:00');
@@ -1933,6 +1933,8 @@ INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUE
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2636', 'DE', 'Diese Webseite verwendet Cookies. Wenn Sie auf der Seite weitersurfen, stimmen Sie der Cookie-Nutzung zu.', '2017-05-14 21:00:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2637', 'DE', 'Dieser Cache ist noch nicht veröffentlicht.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2638', 'DE', 'Prüfe bitte, ob die Cachebeschreibung vollständig ist und alle Cacheigenschaften und -attribute gemäß <a %1>Anleitung</a> eingetragen sind. Dann klicke <strong><a href=\"editcache.php?cacheid=%2&publish=now#others\">hier</a></strong> auf &bdquo;Speichern&ldquo;, um deinen Cache zu veröffentlichen.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2639', 'DE', 'Dieser Cache wird am <b>%1</b> um <b>%2 Uhr</b> veröffentlicht.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2640', 'DE', 'Möchtest du das Bild &bdquo;{title}&ldquo; wirklich löschen?', '2017-08-22 18:45:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2641', 'DE', 'Für diesen Cache ist bereits eine Meldung in Arbeit, siehe unten.', '2017-08-23 13:20:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2650', 'DE', 'Dieser Cache wird heute um <b>%1</b> Uhr veröffentlicht.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2651', 'DE', 'Dieser Cache wird <b>morgen</b> um <b>%1</b> Uhr veröffentlicht.', '2017-08-20 19:30:00');
INSERT INTO `sys_trans_text` (`trans_id`, `lang`, `text`, `last_modified`) VALUES ('2652', 'DE', 'Dieser Cache wird <b>in %1 Tagen</b> (%2) um <b>%3</b> Uhr veröffentlicht.', '2017-08-20 19:30:00');

0 comments on commit acabd45

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