[pLog-svn] r5559 - in plog/branches/lifetype-1.2: class/template/smarty/plugins locale/admin templates/admin
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Thu Jun 21 16:49:48 EDT 2007
Author: oscar
Date: 2007-06-21 16:49:48 -0400 (Thu, 21 Jun 2007)
New Revision: 5559
Modified:
plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.round.php
plog/branches/lifetype-1.2/locale/admin/locale_en_UK.php
plog/branches/lifetype-1.2/templates/admin/editpost.template
plog/branches/lifetype-1.2/templates/admin/newpost.template
plog/branches/lifetype-1.2/templates/admin/resourceinfo.template
plog/branches/lifetype-1.2/templates/admin/resources.template
plog/branches/lifetype-1.2/templates/admin/siteblogs.template
Log:
Fixes for combined mantis issue http://bugs.lifetype.net/view.php?id=1326 -- several fixes for unlocalizable strings, please see the mantis bug report for more details
Modified: plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.round.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.round.php 2007-06-21 20:48:38 UTC (rev 5558)
+++ plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.round.php 2007-06-21 20:49:48 UTC (rev 5559)
@@ -2,12 +2,20 @@
/**
* Smarty Modifier round
* $round The number we're trying to round (don't try this with strings!!)
+ * $locale An optional Locale object that will be used to localize the strings to be displayed.
+ * If none is specified, the default locale will be used.
*/
-function smarty_modifier_round($size)
-{
- if ($size < pow(2,10)) return $size." bytes";
- if ($size >= pow(2,10) && $size < pow(2,20)) return round($size / pow(2,10), 0)." KB";
- if ($size >= pow(2,20) && $size < pow(2,30)) return round($size /pow(2,20), 1)." MB";
- if ($size > pow(2,30)) return round($size / pow(2,30), 2)." GB";
+function smarty_modifier_round($size,$locale = null)
+{
+ // load the default locale if none provided
+ if( $locale == null ) {
+ lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+ $locale =& Locales::getLocale();
+ }
+
+ if ($size < pow(2,10)) return( $size." ".$locale->tr("bytes"));
+ if ($size >= pow(2,10) && $size < pow(2,20)) return( round($size / pow(2,10), 0)." ".$locale->tr("kb"));
+ if ($size >= pow(2,20) && $size < pow(2,30)) return( round($size /pow(2,20), 1)." ".$locale->tr("mb"));
+ if ($size > pow(2,30)) return( round($size / pow(2,30), 2)." ".$locale->tr("gb"));
}
?>
Modified: plog/branches/lifetype-1.2/locale/admin/locale_en_UK.php
===================================================================
--- plog/branches/lifetype-1.2/locale/admin/locale_en_UK.php 2007-06-21 20:48:38 UTC (rev 5558)
+++ plog/branches/lifetype-1.2/locale/admin/locale_en_UK.php 2007-06-21 20:49:48 UTC (rev 5559)
@@ -1190,4 +1190,9 @@
$messages['lt_version_ok'] = 'The current version of Lifetype is up to date.';
$messages['lt_version_error'] = 'The most recent version of Lifetype is: ';
$messages['release_notes'] = 'Release notes';
+
+$messages['kb'] = 'Kb';
+$messages['mb'] = 'Mb';
+$messages['gb'] = 'Gb';
+$messages['edit'] = 'Edit';
?>
\ No newline at end of file
Modified: plog/branches/lifetype-1.2/templates/admin/editpost.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/editpost.template 2007-06-21 20:48:38 UTC (rev 5558)
+++ plog/branches/lifetype-1.2/templates/admin/editpost.template 2007-06-21 20:49:48 UTC (rev 5559)
@@ -141,7 +141,7 @@
{/foreach}
</select>
<input type="text" name="newArticleCategory" id="newArticleCategory" style="width:100px; margin-top:3px;" size="16" value="" />
- <input type="button" name="addArticleCategory" id="addArticleCategory" style="width:35px; margin-top:3px;" value="{$locale->tr("add")}" onclick="javascript:addArticleCategoryAjax()" />
+ <input type="button" name="addArticleCategory" id="addArticleCategory" style="width:auto;margin-top:3px;" value="{$locale->tr("add")}" onclick="javascript:addArticleCategoryAjax()" />
{include file="$admintemplatepath/validate.template" field=postCategories message=$locale->tr("error_no_categories")}
</div>
Modified: plog/branches/lifetype-1.2/templates/admin/newpost.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/newpost.template 2007-06-21 20:48:38 UTC (rev 5558)
+++ plog/branches/lifetype-1.2/templates/admin/newpost.template 2007-06-21 20:49:48 UTC (rev 5559)
@@ -161,7 +161,7 @@
{/foreach}
</select>
<input type="text" name="newArticleCategory" id="newArticleCategory" style="width:100px; margin-top:3px;" size="16" value="" />
- <input type="button" name="addArticleCategory" id="addArticleCategory" style="width:35px; margin-top:3px;" value="{$locale->tr("add")}" onclick="javascript:addArticleCategoryAjax()" />
+ <input type="button" name="addArticleCategory" id="addArticleCategory" style="width:auto;margin-top:3px;" value="{$locale->tr("add")}" onclick="javascript:addArticleCategoryAjax()" />
{include file="$admintemplatepath/validate.template" field=postCategories message=$locale->tr("error_no_category_selected")}
</div>
Modified: plog/branches/lifetype-1.2/templates/admin/resourceinfo.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/resourceinfo.template 2007-06-21 20:48:38 UTC (rev 5558)
+++ plog/branches/lifetype-1.2/templates/admin/resourceinfo.template 2007-06-21 20:49:48 UTC (rev 5559)
@@ -16,7 +16,7 @@
<span id="resourceInformation">
{if $resource->isImage()}
{assign var=imgPath value=$url->resourcePreviewLink($resource)}
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("size")}: {$metadata->getFileSize()|round:$locale} ({$metadata->getFileSize()} {$locale->tr("bytes")})<br/>
{$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
{$locale->tr("dimensions")}: {$metadata->getWidth()} x {$metadata->getHeight()}<br/>
{$locale->tr("bits_per_sample")}: {$metadata->getBitsPerSample()}<br/>
@@ -25,13 +25,13 @@
{elseif $resource->isSound()}
{assign var=imgPath value="imgs/admin/icon_sound-48.png"}
{$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("size")}: {$metadata->getFileSize()|round:$locale} ({$metadata->getFileSize()} {$locale->tr("bytes")})<br/>
{$locale->tr("length")}: {$metadata->getLengthString()}<br/>
{$locale->tr("sample_rate")}: {$metadata->getSampleRate()} Khz<br/>
{$locale->tr("number_of_channels")}: {$metadata->getChannels()|upper}<br/>
{elseif $resource->isVideo()}
{assign var=imgPath value="imgs/admin/icon_video-48.png"}
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("size")}: {$metadata->getFileSize()|round:$locale} ({$metadata->getFileSize()} {$locale->tr("bytes")})<br/>
{$locale->tr("format")}: {$metadata->getFormat()|upper}<br/>
{$locale->tr("length")}: {$metadata->getLengthString()}<br/>
{$locale->tr("video_codec")}: {$metadata->getVideoCodec()}<br/>
@@ -40,12 +40,12 @@
{$locale->tr("bits_per_sample")}: {$metadata->getBitsPerSample()}<br/>
{elseif $resource->isZip()}
{assign var=imgPath value="imgs/admin/icon_compressed-48.png"}
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("size")}: {$metadata->getFileSize()|round:$locale} ({$metadata->getFileSize()} {$locale->tr("bytes")})<br/>
{$locale->tr("number_of_files")}: {$metadata->getTotalFiles()}<br/>
{$locale->tr("uncompressed_size")}: {$metadata->getUncompressedSize()} {$locale->tr("bytes")}<br/>
{else}
{assign var=imgPath value="imgs/admin/icon_file-48.png"}
- {$locale->tr("size")}: {$metadata->getFileSize()} {$locale->tr("bytes")}<br/>
+ {$locale->tr("size")}: {$metadata->getFileSize()|round:$locale} ({$metadata->getFileSize()} {$locale->tr("bytes")})<br/>
{/if}
</span>
</div>
Modified: plog/branches/lifetype-1.2/templates/admin/resources.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/resources.template 2007-06-21 20:48:38 UTC (rev 5558)
+++ plog/branches/lifetype-1.2/templates/admin/resources.template 2007-06-21 20:49:48 UTC (rev 5559)
@@ -136,8 +136,8 @@
<div id="list_action_bar">
{assign var=quota value=$blog->getResourcesQuota()}
{adminpager style=list}
- {$locale->tr("num_resources")}: <strong>{$totalresources}</strong>, {$locale->tr("total_size")}: <strong>{$quotausage|round}</strong>
- {if $quota > 0 }, {$locale->tr("quota")}: <strong>{$quota|round}</strong>{/if}
+ {$locale->tr("num_resources")}: <strong>{$totalresources}</strong>, {$locale->tr("total_size")}: <strong>{$quotausage|round:$locale}</strong>
+ {if $quota > 0 }, {$locale->tr("quota")}: <strong>{$quota|round:$locale}</strong>{/if}
<input type="submit" name="delete" value="{$locale->tr("delete")}" class="submit" />
<input type="hidden" name="op" value="deleteResourceItems" />
<div id="massiveChangeOption" style="display: none;">
Modified: plog/branches/lifetype-1.2/templates/admin/siteblogs.template
===================================================================
--- plog/branches/lifetype-1.2/templates/admin/siteblogs.template 2007-06-21 20:48:38 UTC (rev 5558)
+++ plog/branches/lifetype-1.2/templates/admin/siteblogs.template 2007-06-21 20:49:48 UTC (rev 5559)
@@ -79,7 +79,7 @@
{/foreach}
</td>
<td>
- {$siteblog->getResourcesQuota()|round}
+ {$siteblog->getResourcesQuota()|round:$locale}
</td>
<td>
<div class="list_action_button">
More information about the pLog-svn
mailing list