merged branch pborreli/last-day-typo (PR symfony#1845)

fabpot · fabpot · commit bcf5cebcff71 · 2011-07-28T10:39:55.000+02:00
Commits ------- de5374e [Various] Typos Discussion ---------- [Various] Typos
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fr.xliff b/src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.fr.xliff
@@ -56,7 +56,7 @@
             </trans-unit>
             <trans-unit id="14">
                 <source>The file could not be found</source>
-                <target>Le fichier n'as pas été trouvé</target>
+                <target>Le fichier n'a pas été trouvé</target>
             </trans-unit>
             <trans-unit id="15">
                 <source>The file is not readable</source>
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -72,7 +72,7 @@ public function buildForm(FormBuilder $builder, array $options)
             // user did not made a decision, so we put a blank empty value
             $emptyValue = $options['required'] ? null : '';
         } else {
-            // empty value has been set explicitely
+            // empty value has been set explicitly
             $emptyValue = $options['empty_value'];
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php
@@ -28,8 +28,8 @@ class NativeSessionStorage implements SessionStorageInterface
     /**
      * Available options:
      *
-     *  * name:     The cookie name (null [ommited] by default)
-     *  * id:       The session id (null [ommited] by default)
+     *  * name:     The cookie name (null [omitted] by default)
+     *  * id:       The session id (null [omitted] by default)
      *  * lifetime: Cookie lifetime
      *  * path:     Cookie path
      *  * domain:   Cookie domain

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function buildForm(FormBuilder $builder, array $options)`
`72`	`72`	`// user did not made a decision, so we put a blank empty value`
`73`	`73`	`$emptyValue = $options['required'] ? null : '';`
`74`	`74`	`} else {`
`75`		`- // empty value has been set explicitely`
	`75`	`+ // empty value has been set explicitly`
`76`	`76`	`$emptyValue = $options['empty_value'];`
`77`	`77`	`}`
`78`	`78`