[Translation] removed unneeded getter/setter

symfony · Apr 20, 2013 · ad4624c · stloyd · Apr 20, 2013 · fabpot
1 parent 8792575
commit ad4624c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 45 deletions.
diff --git a/src/Symfony/Component/Translation/Loader/XliffFileLoader.php b/src/Symfony/Component/Translation/Loader/XliffFileLoader.php
@@ -23,37 +23,6 @@
  */
 class XliffFileLoader implements LoaderInterface
 {
-
-    /**
-     * Encoding specified in xlf file
-     *
-     * @var string
-     */
-    protected $encoding = null;
-
-    /**
-     * Get $encoding
-     *
-     * @return string
-     */
-    public function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * Set $encoding
-     *
-     * @param  string $encoding
-     * @return \Symfony\Component\Translation\Loader\XliffFileLoader
-     */
-    public function setEncoding($encoding)
-    {
-        $this->encoding = strtoupper($encoding);
-
-        return $this;
-    }
-
     /**
      * {@inheritdoc}
      *
@@ -68,8 +37,6 @@ public function load($resource, $locale, $domain = 'messages')
         $xml = $this->parseFile($resource);
         $xml->registerXPathNamespace('xliff', 'urn:oasis:names:tc:xliff:document:1.2');
 
-        $encoding = $this->getEncoding();
-
         $catalogue = new MessageCatalogue($locale);
         foreach ($xml->xpath('//xliff:trans-unit') as $translation) {
             $attributes = $translation->attributes();
@@ -81,19 +48,19 @@ public function load($resource, $locale, $domain = 'messages')
             $source = isset($attributes['resname']) && $attributes['resname'] ? $attributes['resname'] : $translation->source;
             $target = (string) $translation->target;
 
-            // If the xlf file has another encoding specified try to convert it here because
+            // If the xlf file has another encoding specified, try to convert it because
             // simple_xml will always return utf-8 encoded values
-            if ($encoding !== null) {
+            if ('UTF-8' !== $this->encoding && !empty($this->encoding)) {
                 if (function_exists('mb_convert_encoding')) {
-                    $target = mb_convert_encoding($target, $encoding, 'UTF-8');
+                    $target = mb_convert_encoding($target, $this->encoding, 'UTF-8');
                 } elseif (function_exists('iconv')) {
-                    $target = iconv('UTF-8', $encoding, $target);
+                    $target = iconv('UTF-8', $this->encoding, $target);
                 } else {
                     throw new \RuntimeException('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
                 }
             }
 
-            $catalogue->set((string) $translation->source, $target, $domain);
+            $catalogue->set((string) $source, $target, $domain);
         }
         $catalogue->addResource(new FileResource($resource));
 
@@ -123,10 +90,7 @@ private function parseFile($file)
             throw new \RuntimeException(implode("\n", $this->getXmlErrors($internalErrors)));
         }
 
-        $encoding = strtoupper($dom->encoding);
-        if (!empty($encoding) && $encoding != 'UTF-8') {
-            $this->setEncoding($encoding);
-        }
+        $this->encoding = strtoupper($dom->encoding);
 
         libxml_disable_entity_loader($disableEntities);
 

diff --git a/src/Symfony/Component/Translation/Tests/fixtures/encoding.xlf b/src/Symfony/Component/Translation/Tests/fixtures/encoding.xlf
@@ -4,11 +4,11 @@
     <body>
       <trans-unit id="1" resname="foo">
         <source>foo</source>
-        <target>bär</target>
+        <target>bär</target>
       </trans-unit>
       <trans-unit id="2" resname="bar">
-        <source>bar</source> 
-        <target>föö</target>
+        <source>bar</source>
+        <target>föö</target>
       </trans-unit>
     </body>
   </file>