Review fixes

composer.json

@@ -10,6 +10,7 @@
     ],
     "require": {
         "php": "^5.5 || ^7.0",
+        "ext-mbstring": "*",
         "php-http/httplug": "^1.0",
         "php-http/client-implementation": "^1.0",
         "php-http/discovery": "^1.0",

src/Service/HttpTranslator.php

@@ -16,11 +16,12 @@
 use Http\Discovery\HttpClientDiscovery;
 use Http\Discovery\MessageFactoryDiscovery;
 use Http\Message\RequestFactory;
+use Translation\Translator\TranslatorService;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-abstract class HttpTranslator extends AbstractTranslator
+abstract class HttpTranslator implements TranslatorService
 {
     /**
      * @var HttpClient
@@ -57,4 +58,49 @@ protected function getRequestFactory()
     {
         return $this->requestFactory;
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function translateArray($strings, $from, $to)
+    {
+        $array = [];
+
+        foreach ($strings as $string) {
+            $array[] = $this->translate($string, $from, $to);
+        }
+
+        return $array;
+    }
+
+    /**
+     * @param string $original
+     * @param string $translationHtmlEncoded
+     *
+     * @return string
+     */
+    protected function format($original, $translationHtmlEncoded)
+    {
+        $translation = htmlspecialchars_decode($translationHtmlEncoded);
+
+        // if capitalized, make sure we also capitalize.
+        $firstChar = \mb_substr($original, 0, 1);
+        $originalIsUpper = \mb_strtoupper($firstChar) === $firstChar;
+
+        if ($originalIsUpper) {
+            $first = \mb_strtoupper(\mb_substr($translation, 0, 1));
+            $translation = $first.\mb_substr($translation, 1);
+        }
+
+        // also check on translated if capitalize and original isn't
+        $transFirstChar = \mb_substr($translationHtmlEncoded, 0, 1);
+        $translationIsUpper = \mb_strtoupper($transFirstChar) === $transFirstChar;
+
+        if (!$originalIsUpper && $translationIsUpper) {
+            $first = \mb_strtolower(\mb_substr($translation, 0, 1));
+            $translation = $first.\mb_substr($translation, 1);
+        }
+
+        return $translation;
+    }
 }