diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' into 5.2

Browse Source 
* 4.4:
  [Inflector][String] Fixed singularize `edges` > `edge`
  ref #41087: missing turkish translations from security component
  Added translations for pt security file.
This commit is contained in:
Alexander M. Turek 2021-05-04 19:54:16 +02:00
commit 7be408a332
5 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Inflector/Tests/InflectorTest.php
View File

@ -69,6 +69,7 @@ class InflectorTest extends TestCase
['drivers', 'driver'],
['dwarves', ['dwarf', 'dwarve', 'dwarff']],
['echoes', ['echo', 'echoe']],
['edges', 'edge'],
['elves', ['elf', 'elve', 'elff']],
['emphases', ['emphas', 'emphase', 'emphasis']],
['employees', 'employee'],
@ -213,6 +214,7 @@ class InflectorTest extends TestCase
['driver', 'drivers'],
['dwarf', ['dwarfs', 'dwarves']],
['echo', 'echoes'],
['edge', 'edges'],
['elf', ['elfs', 'elves']],
['emphasis', 'emphases'],
['fax', ['facies', 'faxes']],

8
src/Symfony/Component/Security/Core/Resources/translations/security.pt.xlf
View File

@ -70,6 +70,14 @@
<source>Invalid or expired login link.</source>
<target>Ligação de login inválida ou expirada.</target>
</trans-unit>
<trans-unit id="19">
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
<target>Demasiadas tentativas de login, tente novamente num minuto.</target>
</trans-unit>
<trans-unit id="20">
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
<target>Demasiadas tentativas de login, tente novamente em %minutes% minutos.</target>
</trans-unit>
</body>
</file>
</xliff>

8
src/Symfony/Component/Security/Core/Resources/translations/security.tr.xlf
View File

@ -70,6 +70,14 @@
<source>Invalid or expired login link.</source>
<target>Geçersiz veya süresi dolmuş oturum açma bağlantısı.</target>
</trans-unit>
<trans-unit id="19">
<source>Too many failed login attempts, please try again in %minutes% minute.</source>
<target>Çok fazla başarısız giriş denemesi, lütfen %minutes% dakika sonra tekrar deneyin.</target>
</trans-unit>
<trans-unit id="20">
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
<target>Çok fazla başarısız giriş denemesi, lütfen %minutes% dakika sonra tekrar deneyin.</target>
</trans-unit>
</body>
</file>
</xliff>

21
src/Symfony/Component/String/Inflector/EnglishInflector.php
View File

@ -118,6 +118,9 @@ final class EnglishInflector implements InflectorInterface
// fees (fee), trees (tree), employees (employee)
['see', 3, true, true, 'ee'],
// edges (edge)
['segd', 4, true, true, 'dge'],
// roses (rose), garages (garage), cassettes (cassette),
// waltzes (waltz), heroes (hero), bushes (bush), arches (arch),
// shoes (shoe)
@ -309,14 +312,32 @@ final class EnglishInflector implements InflectorInterface
*/
private const UNINFLECTED = [
'',
// data
'atad',
// deer
'reed',
// feedback
'kcabdeef',
// fish
'hsif',
// info
'ofni',
// moose
'esoom',
// series
'seires',
// sheep
'peehs',
// species
'seiceps',
];

2
src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
View File

@ -67,6 +67,7 @@ class EnglishInflectorTest extends TestCase
['drivers', 'driver'],
['dwarves', ['dwarf', 'dwarve', 'dwarff']],
['echoes', ['echo', 'echoe']],
['edges', 'edge'],
['elves', ['elf', 'elve', 'elff']],
['emphases', ['emphas', 'emphase', 'emphasis']],
['employees', 'employee'],
@ -211,6 +212,7 @@ class EnglishInflectorTest extends TestCase
['driver', 'drivers'],
['dwarf', ['dwarfs', 'dwarves']],
['echo', 'echoes'],
['edge', 'edges'],
['elf', ['elfs', 'elves']],
['emphasis', 'emphases'],
['fax', ['facies', 'faxes']],