Author: Derick Rethans
Date: 2006-01-14 19:38:42 +0100 (Sat, 14 Jan 2006)
New Revision: 1852
Log:
- Fixed bug where the translation filename format that was passed as an option
in the options array to the contructor was overwritten by the default.
Modified:
packages/Translation/trunk/src/backends/ts_backend.php
packages/Translation/trunk/tests/translation_backend_ts_test.php
Modified: packages/Translation/trunk/src/backends/ts_backend.php
===================================================================
--- packages/Translation/trunk/src/backends/ts_backend.php 2006-01-14
15:24:19 UTC (rev 1851)
+++ packages/Translation/trunk/src/backends/ts_backend.php 2006-01-14
18:38:42 UTC (rev 1852)
@@ -85,7 +85,7 @@
*
* @var string
*/
- private $tsFilenameFormat;
+ private $tsFilenameFormat = '[LOCALE].xml';
/**
* The last read context, as read by next() method.
@@ -134,7 +134,6 @@
}
$this->setOptions( array( 'location' => $location ) );
$this->setOptions( $options );
- $this->tsFilenameFormat = '[LOCALE].xml';
}
/**
Modified: packages/Translation/trunk/tests/translation_backend_ts_test.php
===================================================================
--- packages/Translation/trunk/tests/translation_backend_ts_test.php
2006-01-14 15:24:19 UTC (rev 1851)
+++ packages/Translation/trunk/tests/translation_backend_ts_test.php
2006-01-14 18:38:42 UTC (rev 1852)
@@ -16,13 +16,15 @@
{
public function testConfigSetting()
{
- $backend = new ezcTranslationTsBackend( 'tests/translations', array (
'format' => '[LOCALE].xml' ) );
+ $backend = new ezcTranslationTsBackend( 'tests/translations', array (
'format' => 'test-[LOCALE].xml' ) );
+ self::assertPrivatePropertySame( $backend, 'tsFilenameFormat',
'test-[LOCALE].xml' );
}
public function testConfigSettingAlternative()
{
$backend = new ezcTranslationTsBackend( 'tests/translations' );
- $backend->setOptions( array ( 'format' => '[LOCALE].xml' ) );
+ $backend->setOptions( array ( 'format' => 'test-[LOCALE].xml' ) );
+ self::assertPrivatePropertySame( $backend, 'tsFilenameFormat',
'test-[LOCALE].xml' );
}
public function testConfigSettingBroken()
@@ -41,15 +43,15 @@
public function testBuildTranslationFileName1()
{
$backend = new ezcTranslationTsBackend( 'tests/translations' );
- $backend->setOptions( array ( 'format' => '[LOCALE].xml' ) );
- self::assertEquals( 'tests/translations/nl-nl.xml',
$backend->buildTranslationFileName( 'nl-nl' ) );
+ $backend->setOptions( array ( 'format' => 'test-[LOCALE].xml' ) );
+ self::assertEquals( 'tests/translations/test-nl-nl.xml',
$backend->buildTranslationFileName( 'nl-nl' ) );
}
public function testBuildTranslationFileName2()
{
$backend = new ezcTranslationTsBackend( 'tests/translations/' );
- $backend->setOptions( array ( 'format' => '[LOCALE].xml' ) );
- self::assertEquals( 'tests/translations/nl-nl.xml',
$backend->buildTranslationFileName( 'nl-nl' ) );
+ $backend->setOptions( array ( 'format' => 'test-[LOCALE].xml' ) );
+ self::assertEquals( 'tests/translations/test-nl-nl.xml',
$backend->buildTranslationFileName( 'nl-nl' ) );
}
public function testBuildTranslationFileName3()
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
