Merge commit 'refs/pull/3953/head' of github.com:zendframework/zf2 in…

…to hotfix/camel-case
mnapoli · Mar 5, 2013 · 886029b · 886029b
2 parents 1f94717 + e656bac
commit 886029b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/library/Zend/I18n/View/Helper/DateFormat.php b/library/Zend/I18n/View/Helper/DateFormat.php
@@ -77,7 +77,7 @@ public function getTimezone()
      * @param  string $locale
      * @return DateFormat
      */
-    public function setlocale($locale)
+    public function setLocale($locale)
     {
         $this->locale = (string) $locale;
         return $this;
@@ -88,7 +88,7 @@ public function setlocale($locale)
      *
      * @return string|null
      */
-    public function getlocale()
+    public function getLocale()
     {
         if ($this->locale === null) {
             $this->locale = Locale::getDefault();
@@ -115,7 +115,7 @@ public function __invoke(
         $pattern  = null
     ) {
         if ($locale === null) {
-            $locale = $this->getlocale();
+            $locale = $this->getLocale();
         }
 
         $timezone    = $this->getTimezone();