Skip to content
Permalink
Browse files

translations and translation system update

- consistent naming of cache status and log types
- consistent naming of 'geocache' in French
- ignore okapi_synbase fields on SQL Export

This changes some cache status and log type names in the undocumented /
deprecated search-result XML export function. However, there are also
IDs exported, so this should be fine.
  • Loading branch information...
following5 committed Sep 17, 2015
1 parent 86bf88f commit 8e11347b452ec419d6d5da88455af43a6f9551b8

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1126,7 +1126,8 @@ function sql_export_structure($f, $table)
sql_free_result($rs);
$sTableSql = $r[1];
$sTableSql = preg_replace('/ AUTO_INCREMENT=[0-9]{1,} /', ' ', $sTableSql);
$sTableSql = preg_replace("/ AUTO_INCREMENT=[0-9]{1,} /", ' ', $sTableSql);
$sTableSql = preg_replace("/,\n +?(KEY )?`okapi_syncbase`.+?(,)?\n/", "\\2\n", $sTableSql);
fwrite($f, "SET NAMES 'utf8';\n");
fwrite($f, "DROP TABLE IF EXISTS `" . sql_escape($table) . "`;\n");
@@ -95,9 +95,9 @@
</div>

<p style="line-height: 1.6em;">
<a href="log.php?cacheid={$cacheid}&logtype=10&teamcomment=1" target="_blank"><img src="resource2/{$opt.template.style}/images/log/16x16-active.png" />{t}Ready for search{/t}</a>
<a href="log.php?cacheid={$cacheid}&logtype=10&teamcomment=1" target="_blank"><img src="resource2/{$opt.template.style}/images/log/16x16-active.png" />{t}Available{/t}</a>
&nbsp; &nbsp;
<a href="log.php?cacheid={$cacheid}&logtype=11&teamcomment=1" target="_blank"><img src="resource2/{$opt.template.style}/images/log/16x16-disabled.png" />{t}Temporary not available{/t}</a>
<a href="log.php?cacheid={$cacheid}&logtype=11&teamcomment=1" target="_blank"><img src="resource2/{$opt.template.style}/images/log/16x16-disabled.png" />{t}Temporarily not available{/t}</a>
&nbsp; &nbsp;
<a href="log.php?cacheid={$cacheid}&logtype=9&teamcomment=1" target="_blank"><img src="resource2/{$opt.template.style}/images/log/16x16-archived.png" />{t}Archived{/t}</a>
&nbsp; &nbsp;
@@ -7,13 +7,13 @@
{if $status==1}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-go.png" alt="{t}Available{/t}" title="{t}Available{/t}" />
{elseif $status==2}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-stop.png" alt="{t}Temporary disabled{/t}" title="{t}Temporary disabled{/t}" />
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-stop.png" alt="{t}Temporarily not available{/t}" title="{t}Temporarily not available{/t}" />
{elseif $status==3}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-trash.png" alt="{t}Archived{/t}" title="{t}Archived{/t}" />
{elseif $status==4}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-wait.png" alt="{t}Hidden by approvers to check{/t}" title="{t}Hidden by approvers to check{/t}" />
{elseif $status==5}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-wait.png" alt="{t}Not yet available{/t}" title="{t}Not yet available{/t}" />
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-wait.png" alt="{t}Not yet published{/t}" title="{t}Not yet published{/t}" />
{elseif $status==6}
<img src="resource2/{$opt.template.style}/images/cachestatus/16x16-locked.png" alt="{t}Locked, visible{/t}" title="{t}Locked, visible{/t}" />
{elseif $status==7}
@@ -18,9 +18,9 @@
{elseif $type==9}
<img src="resource2/{$opt.template.style}/images/log/16x16-archived.png" alt="{t}Archived{/t}" title="{t}Archived{/t}" />
{elseif $type==10}
<img src="resource2/{$opt.template.style}/images/log/16x16-active.png" alt="{t}Ready for search{/t}" title="{t}Ready for search{/t}" />
<img src="resource2/{$opt.template.style}/images/log/16x16-active.png" alt="{t}Available{/t}" title="{t}Available{/t}" />
{elseif $type==11}
<img src="resource2/{$opt.template.style}/images/log/16x16-disabled.png" alt="{t}Temporary not available{/t}" title="{t}Temporary not available{/t}" />
<img src="resource2/{$opt.template.style}/images/log/16x16-disabled.png" alt="{t}Temporarily not available{/t}" title="{t}Temporarily not available{/t}" />
{elseif $type==13}
<img src="resource2/{$opt.template.style}/images/log/16x16-locked.png" alt="{t}Locked{/t}" title="{t}Locked{/t}" />
{elseif $type==14}
@@ -44,7 +44,7 @@
// search.*.inc.php (TXT, KML, LOC, GPX ...)
$converted_from_html = _('converted from HTML');
$state_temporarily_na = _('Temporary not available');
$state_temporarily_na = _('Temporarily not available');
$state_archived = _('Archived');
$state_locked = _('Locked');
$cache_note_text = _('Personal cache note');
@@ -38,10 +38,11 @@
<a href="translate.php?translang={$translang}&action=scan">{t}Scan source codes{/t}</a><br />
<br />
<a href="translate.php?translang={$translang}&action=listnew">{t}Show new translations{/t}</a><br />
<a href="translate.php?translang={$translang}&action=clearcache">{t}Clear smarty cache{/t}</a><br />
<a href="translate.php?translang={$translang}&action=listfaults">{t}Show translations no longer referenced{/t}</a><br />
<a href="translate.php?translang={$translang}&action=listall">{t}Show all translations{/t}</a><br />
<a href="translate.php?translang={$translang}&action=listfaults">{t}Show translations no longer referenced{/t}</a><br />
<br />
<a href="translate.php?translang={$translang}&action=verify">{t}Show inconsistencies{/t}</a> (EN)<br />
<a href="translate.php?translang={$translang}&action=clearcache">{t}Clear smarty cache{/t}</a><br />
<a href="translate.php?translang={$translang}&action=resetids">{t}Reorder ID's{/t}</a> {t}(before an export){/t}<br />
<a href="translate.php?translang={$translang}&action=export">{t}SQL Export{/t}</a><br />
<br />
@@ -71,8 +72,8 @@
{elseif $action=="listall"}
<p>{t}All translations:{/t}</p>
{/if}
<br />
<table class="table">
<tr><td></td></td></tr>
{foreach from=$trans item=transItem}
<tr>
<td valign="top"><a href="translate.php?translang={$translang}&action=edit&id={$transItem.id}">{$transItem.id}</a></td>

0 comments on commit 8e11347

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