8000 minor #26614 [Routing] use American English (xabbuh) · symfony/symfony@c559fa3 · GitHub
[go: up one dir, main page]
Skip to content

Commit c559fa3

Browse files
fabpotfabpot
committed
minor #26614 [Routing] use American English (xabbuh)
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 <!-- see https://symfony.com/bc --> | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 2004092 [Routing] use American English
2 parents a1b1a44 + 2004092 commit c559fa3

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

‎src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</xsd:choice>
2525
</xsd:complexType>
2626

27-
<xsd:complexType name="localised-path">
27+
<xsd:complexType name="localized-path">
2828
<xsd:simpleContent>
2929
<xsd:extension base="xsd:string">
3030
<xsd:attribute name="locale" type="xsd:string" use="required" />
@@ -44,7 +44,7 @@
4444
<xsd:complexType name="route">
4545
<xsd:sequence>
4646
<xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
47-
<xsd:element name="path" type="localised-path" minOccurs="0" maxOccurs="unbounded" />
47+
<xsd:element name="path" type="localized-path" minOccurs="0" maxOccurs="unbounded" />
4848
</xsd:sequence>
4949
<xsd:attribute name="id" type="xsd:string" use="required" />
5050
<xsd:attribute name="path" type="xsd:string" />
@@ -57,7 +57,7 @@
5757
<xsd:complexType name="import">
5858
<xsd:sequence maxOccurs="unbounded" minOccurs="0">
5959
<xsd:group ref="configs" minOccurs="0" maxOccurs="unbounded" />
60-
<xsd:element name="prefix" type="localised-path" minOccurs="0" maxOccurs="unbounded" />
60+
<xsd:element name="prefix" type="localized-path" minOccurs="0" maxOccurs="unbounded" />
6161
</xsd:sequence>
6262
<xsd:attribute name="resource" type="xsd:string" use="required" />
6363
<xsd:attribute name="type" type="xsd:string" />

‎src/Symfony/Component/Routing/Tests/Fixtures/localised.xml renamed to ‎src/Symfony/Component/Routing/Tests/Fixtures/localized.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
66

7-
<route id="localised">
7+
<route id="localized">
88
<default key="_controller">MyBundle:Blog:show</default>
99
<path locale="en">/path</path>
1010
<path locale="fr">/route</path>
1111
</route>
1212

13-
</routes>
13+
</routes>

‎src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,17 +86,17 @@ public function testLoadWithImport()
8686
public function testLoadLocalized()
8787
{
8888
$loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures')));
89-
$routeCollection = $loader->load('localised.xml');
89+
$routeCollection = $loader->load('localized.xml');
9090
$routes = $routeCollection->all();
9191

9292
$this->assertCount(2, $routes, 'Two routes are loaded');
9393
$this->assertContainsOnly('Symfony\Component\Routing\Route', $routes);
9494

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());
9797
}
9898

99-
public function testLocalisedImports()
99+
public function testLocalizedImports()
100100
{
101101
$loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
102102
$routeCollection = $loader->load('importer-with-locale.xml');
@@ -109,7 +109,7 @@ public function testLocalisedImports()
109109
$this->assertEquals('/the-prefix/suffix', $routeCollection->get('imported.en')->getPath());
110110
}
111111

112-
public function testLocalisedImportsOfNotLocalizedRoutes()
112+
public function testLocalizedImportsOfNotLocalizedRoutes()
113113
{
114114
$loader = new XmlFileLoader(new FileLocator(array(__DIR__.'/../Fixtures/localized')));
115115
$routeCollection = $loader->load('importer-with-locale-imports-non-localized-route.xml');

0 commit comments

Comments
 (0)
0