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

Merge branch '2.2' 

* 2.2:
  [Validator] added missing estonian translation of messages
  Removed trailing whitespace
  [Validator] added missing estonian translation of messages
  Filesystem::touch() not working with different owners (utime/atime issue)
This commit is contained in:
Fabien Potencier 2013-04-21 19:39:37 +02:00
parent ab209b2cc9 c8e3f0fabe
commit 488d5eb1fc
2 changed files with 99 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/Filesystem/Filesystem.php
View File

@ -100,12 +100,9 @@ class Filesystem
*/
public function touch($files, $time = null, $atime = null)
{
if (null === $time) {
$time = time();
}
foreach ($this->toIterator($files) as $file) {
if (true !== @touch($file, $time, $atime)) {
$touch = $time ? @touch($file, $time, $atime) : @touch($file);
if (true !== $touch) {
throw new IOException(sprintf('Failed to touch %s', $file));
}
}

98
src/Symfony/Component/Validator/Resources/translations/validators.et.xlf
View File

@ -125,7 +125,103 @@
<trans-unit id="34">
<source>The file could not be uploaded.</source>
<target>Faili ei saa üles laadida.</target>
</trans-unit>
</trans-unit>
<trans-unit id="35">
<source>This value should be a valid number.</source>
<target>Väärtus peaks olema korrektne number.</target>
</trans-unit>
<trans-unit id="36">
<source>This file is not a valid image.</source>
<target>Fail ei ole korrektne pilt.</target>
</trans-unit>
<trans-unit id="37">
<source>This is not a valid IP address.</source>
<target>IP aadress pole korrektne.</target>
</trans-unit>
<trans-unit id="38">
<source>This value is not a valid language.</source>
<target>Väärtus pole korrektne keel.</target>
</trans-unit>
<trans-unit id="39">
<source>This value is not a valid locale.</source>
<target>Väärtus pole korrektne asukohakeel.</target>
</trans-unit>
<trans-unit id="40">
<source>This value is not a valid country.</source>
<target>Väärtus pole olemasolev riik.</target>
</trans-unit>
<trans-unit id="41">
<source>This value is already used.</source>
<target>Väärtust on juba kasutatud.</target>
</trans-unit>
<trans-unit id="42">
<source>The size of the image could not be detected.</source>
<target>Pildi suurust polnud võimalik tuvastada.</target>
</trans-unit>
<trans-unit id="43">
<source>The image width is too big ({{ width }}px). Allowed maximum width is {{ max_width }}px.</source>
<target>Pilt on liiga lai ({{ width }}px). Suurim lubatud laius on {{ max_width }}px.</target>
</trans-unit>
<trans-unit id="44">
<source>The image width is too small ({{ width }}px). Minimum width expected is {{ min_width }}px.</source>
<target>Pilt on liiga kitsas ({{ width }}px). Vähim lubatud laius on {{ min_width }}px.</target>
</trans-unit>
<trans-unit id="45">
<source>The image height is too big ({{ height }}px). Allowed maximum height is {{ max_height }}px.</source>
<target>Pilt on liiga pikk ({{ height }}px). Lubatud suurim pikkus on {{ max_height }}px.</target>
</trans-unit>
<trans-unit id="46">
<source>The image height is too small ({{ height }}px). Minimum height expected is {{ min_height }}px.</source>
<target>Pilt pole piisavalt pikk ({{ height }}px). Lubatud vähim pikkus on {{ min_height }}px.</target>
</trans-unit>
<trans-unit id="47">
<source>This value should be the user current password.</source>
<target>Väärtus peaks olema kasutaja kehtiv salasõna.</target>
</trans-unit>
<trans-unit id="48">
<source>This value should have exactly {{ limit }} characters.</source>
<target>Väärtus peaks olema täpselt {{ limit }} tähemärk pikk.|Väärtus peaks olema täpselt {{ limit }} tähemärki pikk.</target>
</trans-unit>
<trans-unit id="49">
<source>The file was only partially uploaded.</source>
<source>Fail ei laetud täielikult üles.</target>
</trans-unit>
<trans-unit id="50">
<source>No file was uploaded.</source>
<target>Ühtegi faili ei laetud üles.</target>
</trans-unit>
<trans-unit id="51">
<source>No temporary folder was configured in php.ini.</source>
<target>Ühtegi ajutist kausta polnud php.ini-s seadistatud.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
<target>Ajutist faili ei saa kettale kirjutada.</target>
</trans-unit>
<trans-unit id="53">
<source>A PHP extension caused the upload to fail.</source>
<target>PHP laiendi tõttu ebaõnnestus faili üleslaadimine.</target>
</trans-unit>
<trans-unit id="54">
<source>This collection should contain {{ limit }} elements or more.</source>
<target>Kogumikus peaks olema vähemalt {{ limit }} element.|Kogumikus peaks olema vähemalt {{ limit }} elementi.</target>
</trans-unit>
<trans-unit id="55">
<source>This collection should contain {{ limit }} elements or less.</source>
<target>Kogumikus peaks olema ülimalt {{ limit }} element.|Kogumikus peaks olema ülimalt {{ limit }} elementi.</target>
</trans-unit>
<trans-unit id="56">
<source>This collection should contain exactly {{ limit }} elements.</source>
<target>Kogumikus peaks olema täpselt {{ limit }} element.|Kogumikus peaks olema täpselt {{ limit }}|elementi.</target>
</trans-unit>
<trans-unit id="57">
<source>Invalid card number.</source>
<target>Vigane kaardi number.</target>
</trans-unit>
<trans-unit id="58">
<source>Unsupported card type or invalid card number.</source>
<target>Kaardi tüüpi ei toetata või kaardi number on vigane.</target>
</trans-unit>
</body>
</file>
</xliff>