Permalink
Browse files

merge github master

  • Loading branch information...
cweiske committed Jun 4, 2012
1 parent 2c62d9b commit f64c269aa7c4a32023a4a7dae8f3e0fcbcb9ef01
Showing with 4 additions and 4 deletions.
  1. +2 −2 src/Date/HumanDiff/{Lang → Locale}/el.php
  2. +2 −2 tests/Date/HumanDiffTest.php
@@ -1,7 +1,7 @@
<?php
-require_once 'Date/HumanDiff/LangArray.php';
+require_once 'Date/HumanDiff/LocaleArray.php';
-class Date_HumanDiff_Lang_el extends Date_HumanDiff_LangArray
+class Date_HumanDiff_Locale_el extends Date_HumanDiff_LocaleArray
{
/**
* Translation array.
@@ -102,7 +102,7 @@ public function testSetLocaleExisting()
$this->assertTrue($this->dh->setLocale('de'));
$this->assertEquals('gerade eben', $this->dh->get(time()));
- $this->assertTrue($this->dh->setLanguage('el'));
+ $this->assertTrue($this->dh->setLocale('el'));
$this->assertEquals('μόλις τώρα', $this->dh->get(time()));
}
@@ -111,7 +111,7 @@ public function testSetLocaleParentExisting()
$this->assertTrue($this->dh->setLocale('de_AT'));
$this->assertEquals('gerade eben', $this->dh->get(time()));
- $this->assertTrue($this->dh->setLanguage('el_GR'));
+ $this->assertTrue($this->dh->setLocale('el_GR'));
$this->assertEquals('μόλις τώρα', $this->dh->get(time()));
}

0 comments on commit f64c269

Please sign in to comment.