minor #26614 [Routing] use American English (xabbuh)

fabpot · fabpot · commit c559fa3c8f4f · 2018-03-21T10:38:51.000+01:00
This PR was merged into the 4.1-dev branch. Discussion ---------- [Routing] use American English | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no  | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 2004092 [Routing] use American English
diff --git a/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd b/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
@@ -24,7 +24,7 @@
     </xsd:choice>
   </xsd:complexType>
 
-  <xsd:complexType name="localised-path">
+  <xsd:complexType name="localized-path">
     <xsd:simpleContent>
       <xsd:extension base="xsd:string">
         <xsd:attribute name="locale" type="xsd:string" use="required" />
@@ -44,7 +44,7 @@
   <xsd:complexType name="route">
     <xsd:sequence>
       <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="path" type="localised-path" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="path" type="localized-path" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
     <xsd:attribute name="id" type="xsd:string" use="required" />
     <xsd:attribute name="path" type="xsd:string" />
@@ -57,7 +57,7 @@
   <xsd:complexType name="import">
     <xsd:sequence maxOccurs="unbounded" minOccurs="0">
       <xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
-      <xsd:element name="prefix" type="localised-path" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="prefix" type="localized-path" minOccurs="0" maxOccurs="unbounded" />
     </xsd:sequence>
     <xsd:attribute name="resource" type="xsd:string" use="required" />
     <xsd:attribute name="type" type="xsd:string" />
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/localized.xml b/src/Symfony/Component/Routing/Tests/Fixtures/localized.xml
@@ -4,10 +4,10 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
 
-    <route id="localised">
+    <route id="localized">
         <default key="_controller">MyBundle:Blog:show</default>
         <path locale="en">/path</path>
         <path locale="fr">/route</path>
     </route>
 
-</routes>
+</routes>
diff --git a/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
@@ -86,17 +86,17 @@ public function testLoadWithImport()
     public function testLoadLocalized()
     {
         $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
-        $routeCollection = $loader->load('localised.xml');
+        $routeCollection = $loader->load('localized.xml');
         $routes = $routeCollection->all();
 
         $this->assertCount(2, $routes, 'Two routes are loaded');
         $this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
 
-        $this->assertEquals('/route', $routeCollection->get('localised.fr')->getPath());
-        $this->assertEquals('/path', $routeCollection->get('localised.en')->getPath());
+        $this->assertEquals('/route', $routeCollection->get('localized.fr')->getPath());
+        $this->assertEquals('/path', $routeCollection->get('localized.en')->getPath());
     }
 
-    public function testLocalisedImports()
+    public function testLocalizedImports()
     {
         $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
         $routeCollection = $loader->load('importer-with-locale.xml');
@@ -109,7 +109,7 @@ public function testLocalisedImports()
         $this->assertEquals('/the-prefix/suffix', $routeCollection->get('imported.en')->getPath());
     }
 
-    public function testLocalisedImportsOfNotLocalizedRoutes()
+    public function testLocalizedImportsOfNotLocalizedRoutes()
     {
         $loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
         $routeCollection = $loader->load('importer-with-locale-imports-non-localized-route.xml');

Original file line number	Diff line number	Diff line change
`@@ -86,17 +86,17 @@ public function testLoadWithImport()`
`86`	`86`	`public function testLoadLocalized()`
`87`	`87`	`{`
`88`	`88`	`$loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));`
`89`		`- $routeCollection = $loader->load('localised.xml');`
	`89`	`+ $routeCollection = $loader->load('localized.xml');`
`90`	`90`	`$routes = $routeCollection->all();`
`91`	`91`
`92`	`92`	`$this->assertCount(2, $routes, 'Two routes are loaded');`
`93`	`93`	`$this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);`
`94`	`94`
`95`		`- $this->assertEquals('/route', $routeCollection->get('localised.fr')->getPath());`
`96`		`- $this->assertEquals('/path', $routeCollection->get('localised.en')->getPath());`
	`95`	`+ $this->assertEquals('/route', $routeCollection->get('localized.fr')->getPath());`
	`96`	`+ $this->assertEquals('/path', $routeCollection->get('localized.en')->getPath());`
`97`	`97`	`}`
`98`	`98`
`99`		`- public function testLocalisedImports()`
	`99`	`+ public function testLocalizedImports()`
`100`	`100`	`{`
`101`	`101`	`$loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));`
`102`	`102`	`$routeCollection = $loader->load('importer-with-locale.xml');`
`@@ -109,7 +109,7 @@ public function testLocalisedImports()`
`109`	`109`	`$this->assertEquals('/the-prefix/suffix', $routeCollection->get('imported.en')->getPath());`
`110`	`110`	`}`
`111`	`111`
`112`		`- public function testLocalisedImportsOfNotLocalizedRoutes()`
	`112`	`+ public function testLocalizedImportsOfNotLocalizedRoutes()`
`113`	`113`	`{`
`114`	`114`	`$loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));`
`115`	`115`	`$routeCollection = $loader->load('importer-with-locale-imports-non-localized-route.xml');`