Merge branch 'master' of git://github.com/zendframework/zf2

zendframework · Jul 26, 2012 · 281109c · 281109c
commit 281109c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/.travis.yml b/.travis.yml
@@ -7,9 +7,11 @@ php:
 
 before_install:
  - cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
+ - curl -s https://getcomposer.org/installer | php -- --quiet
+ - php composer.phar install --dev
 
 script:
  - php ./tests/run-tests.php
 
 notifications:
-  irc: "irc.freenode.org#zftalk.2"
+  irc: "irc.freenode.org#zftalk.2"
diff --git a/languages/it/Zend_Validate.php b/languages/it/Zend_Validate.php
@@ -201,7 +201,7 @@
     "'%value%' appears to be a local network name but local network names are not allowed" => "'%value%' sembra essere un nome di una rete locale e queste non sono consentite",
     "'%value%' appears to be a DNS hostname but the given punycode notation cannot be decoded" => "'%value%' sembra essere un hostname DNS ma la notazione punycode data non può essere decodificata",
     "'%value%' does not appear to be a valid URI hostname" => "'%value%' non sembra essere un hostname URI valido",
-    
+
     // Zend_Validate_Iban
     "Unknown country within the IBAN '%value%'" => "Codice paese sconosciuto con l'IBAN '%value%'",
     "'%value%' has a false IBAN format" => "'%value%' ha un formato IBAN non valido",