Changeset 1583
- Timestamp:
- 05/24/08 01:21:55 (5 months ago)
- Files:
-
- trunk/src/main/php/net/stubbles/websites/xml/skin/stubDefaultSkinGenerator.php (modified) (1 diff)
- trunk/src/main/resources/ipo/request.xml (modified) (16 diffs)
- trunk/src/main/resources/xsl/master.xsl (modified) (1 diff)
- trunk/src/main/resources/xsl/stub.xsl (modified) (3 diffs)
- trunk/src/test/php/net/stubbles/integration/stubRequestValueErrorXJConfFactoryTestCase.php (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main/php/net/stubbles/websites/xml/skin/stubDefaultSkinGenerator.php
r1535 r1583 115 115 $xslProcessor->importXSLStylesheet($this->createXSLStylesheet()); 116 116 $xslProcessor->setParameter('', 'page', $page->getProperty('name')); 117 $xslProcessor->setParameter('', 'lang', $this->getLanguage($session, $page)); 117 $lang = $this->getLanguage($session, $page); 118 $xslProcessor->setParameter('', 'lang', $lang); 119 $xslProcessor->setParameter('', 'lang_base', substr($lang, 0, strpos($lang, '_')) . '_*'); 118 120 stubXMLXIncludeStreamWrapper::register(); 119 121 stubXMLXIncludeStreamWrapper::setIncludePath(stubConfig::getPagePath() . '/txt'); trunk/src/main/resources/ipo/request.xml
r1059 r1583 5 5 <error id="FIELD_EMPTY"> 6 6 <messages> 7 <message locale="en_EN">Please enter a value.</message> 8 <message locale="de_DE">Bitte geben Sie einen Wert an.</message> 7 <message locale="default">Please enter a value.</message> 8 <message locale="en_*">Please enter a value.</message> 9 <message locale="de_*">Bitte geben Sie einen Wert an.</message> 9 10 </messages> 10 11 <valueKeys /> … … 12 13 <error id="FIELD_NO_SELECT"> 13 14 <messages> 14 <message locale="en_EN">Please choose a value.</message> 15 <message locale="de_DE">Bitte wÀhlen Sie einen Wert aus.</message> 15 <message locale="default">Please choose a value.</message> 16 <message locale="en_*">Please choose a value.</message> 17 <message locale="de_*">Bitte wÀhlen Sie einen Wert aus.</message> 16 18 </messages> 17 19 <valueKeys /> … … 19 21 <error id="FIELD_WRONG_VALUE"> 20 22 <messages> 21 <message locale="en_EN">Please enter a correct value.</message> 22 <message locale="de_DE">Bitte geben Sie einen korrekten Wert an.</message> 23 <message locale="default">Please enter a correct value.</message> 24 <message locale="en_*">Please enter a correct value.</message> 25 <message locale="de_*">Bitte geben Sie einen korrekten Wert an.</message> 23 26 </messages> 24 27 <valueKeys /> … … 26 29 <error id="VALUE_TOO_SMALL"> 27 30 <messages> 28 <message locale="en_EN">Please enter a value greater or equal to {minNumber}.</message> 29 <message locale="de_DE">Bitte geben Sie einen Wert gröÃer oder gleich {minNumber} an.</message> 31 <message locale="default">Please enter a value greater or equal to {minNumber}.</message> 32 <message locale="en_*">Please enter a value greater or equal to {minNumber}.</message> 33 <message locale="de_*">Bitte geben Sie einen Wert gröÃer oder gleich {minNumber} an.</message> 30 34 </messages> 31 35 <valueKeys> … … 35 39 <error id="VALUE_TOO_GREAT"> 36 40 <messages> 37 <message locale="en_EN">Please enter a value smaller or equal to {maxNumber}.</message> 38 <message locale="de_DE">Bitte geben Sie einen Wert kleiner oder gleich {maxNumber} an.</message> 41 <message locale="default">Please enter a value smaller or equal to {maxNumber}.</message> 42 <message locale="en_*">Please enter a value smaller or equal to {maxNumber}.</message> 43 <message locale="de_*">Bitte geben Sie einen Wert kleiner oder gleich {maxNumber} an.</message> 39 44 </messages> 40 45 <valueKeys> … … 44 49 <error id="PASSWORDS_NOT_EQUAL"> 45 50 <messages> 46 <message locale="en_EN">Your passwords are not equal. Please enter the same password in both fields.</message> 47 <message locale="de_DE">Die eingegebenen Passwörter stimmen nicht ÃŒberein. Bitte geben Sie in beiden Feldern das gleiche Passwort an.</message> 51 <message locale="default">Your passwords are not equal. Please enter the same password in both fields.</message> 52 <message locale="en_*">Your passwords are not equal. Please enter the same password in both fields.</message> 53 <message locale="de_*">Die eingegebenen Passwörter stimmen nicht ÃŒberein. Bitte geben Sie in beiden Feldern das gleiche Passwort an.</message> 48 54 </messages> 49 55 <valueKeys /> … … 51 57 <error id="PASSWORD_INVALID"> 52 58 <messages> 53 <message locale="en_EN">You choose an invalid password. Please choose another password.</message> 54 <message locale="de_DE">Sie haben ein ungÃŒltiges Passwort angegeben. Bitte wÀhlen Sie ein anderes Passwort.</message> 59 <message locale="default">You choose an invalid password. Please choose another password.</message> 60 <message locale="en_*">You choose an invalid password. Please choose another password.</message> 61 <message locale="de_*">Sie haben ein ungÃŒltiges Passwort angegeben. Bitte wÀhlen Sie ein anderes Passwort.</message> 55 62 </messages> 56 63 <valueKeys /> … … 58 65 <error id="PASSWORD_TOO_LESS_DIFF_CHARS"> 59 66 <messages> 60 <message locale="en_EN">Your password has to less different characters. Please choose another password.</message> 61 <message locale="de_DE">Ihr Passwort hat zu wenig unterschiedliche Zeichen. Bitte wÀhlen Sie ein anderes Passwort.</message> 67 <message locale="default">Your password has to less different characters. Please choose another password.</message> 68 <message locale="en_*">Your password has to less different characters. Please choose another password.</message> 69 <message locale="de_*">Ihr Passwort hat zu wenig unterschiedliche Zeichen. Bitte wÀhlen Sie ein anderes Passwort.</message> 62 70 </messages> 63 71 <valueKeys /> … … 65 73 <error id="STRING_TOO_SHORT"> 66 74 <messages> 67 <message locale="en_EN">Please enter at least {minLength} characters.</message> 68 <message locale="de_DE">Bitte geben Sie mindestens {minLength} Zeichen an.</message> 75 <message locale="default">Please enter at least {minLength} characters.</message> 76 <message locale="en_*">Please enter at least {minLength} characters.</message> 77 <message locale="de_*">Bitte geben Sie mindestens {minLength} Zeichen an.</message> 69 78 </messages> 70 79 <valueKeys> … … 74 83 <error id="STRING_TOO_LONG"> 75 84 <messages> 76 <message locale="en_EN">Please use not more than {maxLength} characters.</message> 77 <message locale="de_DE">Bitte geben Sie nicht mehr als {maxLength} Zeichen an.</message> 85 <message locale="default">Please use not more than {maxLength} characters.</message> 86 <message locale="en_*">Please use not more than {maxLength} characters.</message> 87 <message locale="de_*">Bitte geben Sie nicht mehr als {maxLength} Zeichen an.</message> 78 88 </messages> 79 89 <valueKeys> … … 83 93 <error id="DATE_INVALID"> 84 94 <messages> 85 <message locale="en_EN">Please enter a correct time.</message> 86 <message locale="de_DE">Bitte wÀhlen Sie ein korrektes Datum.</message> 95 <message locale="default">Please enter a correct time.</message> 96 <message locale="en_*">Please enter a correct time.</message> 97 <message locale="de_*">Bitte wÀhlen Sie ein korrektes Datum.</message> 87 98 </messages> 88 99 <valueKeys /> … … 90 101 <error id="DATE_TOO_EARLY"> 91 102 <messages> 92 <message locale="en_EN">The choosen date is too early. The earliest possible date is {earliestDate}.</message> 93 <message locale="de_DE">Das gewÀhlte Datum ist zu frÃŒh. Das frÃŒhestmögliche Datum ist {earliestDate}.</message> 103 <message locale="default">The choosen date is too early. The earliest possible date is {earliestDate}.</message> 104 <message locale="en_*">The choosen date is too early. The earliest possible date is {earliestDate}.</message> 105 <message locale="de_*">Das gewÀhlte Datum ist zu frÃŒh. Das frÃŒhestmögliche Datum ist {earliestDate}.</message> 94 106 </messages> 95 107 <valueKeys> … … 99 111 <error id="DATE_TOO_LATE"> 100 112 <messages> 101 <message locale="en_EN">The choosen date is too late. The latest possible date is {latestDate}.</message> 102 <message locale="de_DE">Das gewÀhlte Datum ist zu spÀt. Das spÀtestmögliche Datum ist {latestDate}.</message> 113 <message locale="default">The choosen date is too late. The latest possible date is {latestDate}.</message> 114 <message locale="en_*">The choosen date is too late. The latest possible date is {latestDate}.</message> 115 <message locale="de_*">Das gewÀhlte Datum ist zu spÀt. Das spÀtestmögliche Datum ist {latestDate}.</message> 103 116 </messages> 104 117 <valueKeys> … … 108 121 <error id="MAILADDRESS_INCORRECT"> 109 122 <messages> 110 <message locale="en_EN">The mail address is not correct.</message> 111 <message locale="de_DE">Die E-Mail-Adresse ist nicht korrekt.</message> 123 <message locale="default">The mail address is not correct.</message> 124 <message locale="en_*">The mail address is not correct.</message> 125 <message locale="de_*">Die E-Mail-Adresse ist nicht korrekt.</message> 112 126 </messages> 113 127 <valueKeys /> … … 115 129 <error id="URL_INCORRECT"> 116 130 <messages> 117 <message locale="en_EN">The URL is not a valid HTTP-URL.</message> 118 <message locale="de_DE">Der URL ist kein gÃŒltiger HTTP-URL.</message> 131 <message locale="default">The URL is not a valid HTTP-URL.</message> 132 <message locale="en_*">The URL is not a valid HTTP-URL.</message> 133 <message locale="de_*">Der URL ist kein gÃŒltiger HTTP-URL.</message> 119 134 </messages> 120 135 <valueKeys /> … … 122 137 <error id="URL_NOT_AVAILABLE"> 123 138 <messages> 124 <message locale="en_EN">The URL is not available.</message> 125 <message locale="de_DE">Der URL ist nicht erreichbar.</message> 139 <message locale="default">The URL is not available.</message> 140 <message locale="en_*">The URL is not available.</message> 141 <message locale="de_*">Der URL ist nicht erreichbar.</message> 126 142 </messages> 127 143 <valueKeys /> trunk/src/main/resources/xsl/master.xsl
r1355 r1583 15 15 <xsl:param name="page" select="@page"/> 16 16 <xsl:param name="lang" select="@lang"/> 17 <xsl:param name="lang_base" select="@lang_base"/> 17 18 18 19 <xsl:template match="/"> trunk/src/main/resources/xsl/stub.xsl
r1581 r1583 217 217 <xsl:template match="stub:langselect" name="stub:langselect"> 218 218 <xsl:variable name="langnodes" select="./stub:lang[@name = $lang]"/> 219 <xsl:variable name="langbasenodes" select="./stub:lang[@name = $lang_base]"/> 219 220 <xsl:variable name="defaultnodes" select="./stub:lang[@name = 'default']"/> 220 221 <xsl:choose> 221 222 <xsl:when test="$langnodes"> 222 223 <xsl:apply-templates select="$langnodes/node()"/> 224 </xsl:when> 225 <xsl:when test="$langbasenodes"> 226 <xsl:apply-templates select="$langbasenodes/node()"/> 223 227 </xsl:when> 224 228 <xsl:when test="$defaultnodes"> … … 229 233 <xsl:text>[ No content for </xsl:text> 230 234 <xsl:value-of select="$lang"/> 231 <xsl:text> - specify at least language default ]</xsl:text> 235 <xsl:text> or </xsl:text> 236 <xsl:value-of select="$lang_base"/> 237 <xsl:text> - specify at least language default ]</xsl:text> 232 238 </small> 233 239 </xsl:otherwise> … … 448 454 <xsl:value-of select="$lang"/> 449 455 </xsl:when> 456 <xsl:when test="$lang_base"> 457 <xsl:value-of select="$lang_base"/> 458 </xsl:when> 450 459 <xsl:otherwise> 451 <xsl:text> en_EN</xsl:text>460 <xsl:text>default</xsl:text> 452 461 </xsl:otherwise> 453 462 </xsl:choose> trunk/src/test/php/net/stubbles/integration/stubRequestValueErrorXJConfFactoryTestCase.php
r1326 r1583 73 73 $this->assertType('stubRequestValueError', $requestError); 74 74 $this->assertEquals('FIELD_EMPTY', $requestError->getId()); 75 $this->assertTrue($requestError->hasMessage('en_EN')); 76 $this->assertTrue($requestError->hasMessage('de_DE')); 75 $this->assertTrue($requestError->hasMessage('default')); 76 $this->assertTrue($requestError->hasMessage('en_*')); 77 $this->assertTrue($requestError->hasMessage('de_*')); 77 78 $requestError2 = $rveFactory->create('FIELD_EMPTY'); 78 79 $this->assertNotSame($requestError, $requestError2); … … 89 90 $this->assertType('stubRequestValueError', $requestError); 90 91 $this->assertEquals('FIELD_NO_SELECT', $requestError->getId()); 91 $this->assertTrue($requestError->hasMessage('en_EN')); 92 $this->assertTrue($requestError->hasMessage('de_DE')); 92 $this->assertTrue($requestError->hasMessage('default')); 93 $this->assertTrue($requestError->hasMessage('en_*')); 94 $this->assertTrue($requestError->hasMessage('de_*')); 93 95 $requestError2 = $rveFactory->create('FIELD_NO_SELECT'); 94 96 $this->assertNotSame($requestError, $requestError2); … … 105 107 $this->assertType('stubRequestValueError', $requestError); 106 108 $this->assertEquals('FIELD_WRONG_VALUE', $requestError->getId()); 107 $this->assertTrue($requestError->hasMessage('en_EN')); 108 $this->assertTrue($requestError->hasMessage('de_DE')); 109 $this->assertTrue($requestError->hasMessage('default')); 110 $this->assertTrue($requestError->hasMessage('en_*')); 111 $this->assertTrue($requestError->hasMessage('de_*')); 109 112 $requestError2 = $rveFactory->create('FIELD_WRONG_VALUE'); 110 113 $this->assertNotSame($requestError, $requestError2); … … 121 124 $this->assertType('stubRequestValueError', $requestError); 122 125 $this->assertEquals('VALUE_TOO_SMALL', $requestError->getId()); 123 $this->assertTrue($requestError->hasMessage('en_EN')); 124 $this->assertTrue($requestError->hasMessage('de_DE')); 126 $this->assertTrue($requestError->hasMessage('default')); 127 $this->assertTrue($requestError->hasMessage('en_*')); 128 $this->assertTrue($requestError->hasMessage('de_*')); 125 129 $requestError2 = $rveFactory->create('VALUE_TOO_SMALL'); 126 130 $this->assertNotSame($requestError, $requestError2); … … 137 141 $this->assertType('stubRequestValueError', $requestError); 138 142 $this->assertEquals('VALUE_TOO_GREAT', $requestError->getId()); 139 $this->assertTrue($requestError->hasMessage('en_EN')); 140 $this->assertTrue($requestError->hasMessage('de_DE')); 143 $this->assertTrue($requestError->hasMessage('default')); 144 $this->assertTrue($requestError->hasMessage('en_*')); 145 $this->assertTrue($requestError->hasMessage('de_*')); 141 146 $requestError2 = $rveFactory->create('VALUE_TOO_GREAT'); 142 147 $this->assertNotSame($requestError, $requestError2); … … 153 158 $this->assertType('stubRequestValueError', $requestError); 154 159 $this->assertEquals('PASSWORDS_NOT_EQUAL', $requestError->getId()); 155 $this->assertTrue($requestError->hasMessage('en_EN')); 156 $this->assertTrue($requestError->hasMessage('de_DE')); 160 $this->assertTrue($requestError->hasMessage('default')); 161 $this->assertTrue($requestError->hasMessage('en_*')); 162 $this->assertTrue($requestError->hasMessage('de_*')); 157 163 $requestError2 = $rveFactory->create('PASSWORDS_NOT_EQUAL'); 158 164 $this->assertNotSame($requestError, $requestError2); … … 169 175 $this->assertType('stubRequestValueError', $requestError); 170 176 $this->assertEquals('PASSWORD_INVALID', $requestError->getId()); 171 $this->assertTrue($requestError->hasMessage('en_EN')); 172 $this->assertTrue($requestError->hasMessage('de_DE')); 177 $this->assertTrue($requestError->hasMessage('default')); 178 $this->assertTrue($requestError->hasMessage('en_*')); 179 $this->assertTrue($requestError->hasMessage('de_*')); 173 180 $requestError2 = $rveFactory->create('PASSWORD_INVALID'); 174 181 $this->assertNotSame($requestError, $requestError2); … … 185 192 $this->assertType('stubRequestValueError', $requestError); 186 193 $this->assertEquals('PASSWORD_TOO_LESS_DIFF_CHARS', $requestError->getId()); 187 $this->assertTrue($requestError->hasMessage('en_EN')); 188 $this->assertTrue($requestError->hasMessage('de_DE')); 194 $this->assertTrue($requestError->hasMessage('default')); 195 $this->assertTrue($requestError->hasMessage('en_*')); 196 $this->assertTrue($requestError->hasMessage('de_*')); 189 197 $requestError2 = $rveFactory->create('PASSWORD_TOO_LESS_DIFF_CHARS'); 190 198 $this->assertNotSame($requestError, $requestError2); … … 201 209 $this->assertType('stubRequestValueError', $requestError); 202 210 $this->assertEquals('STRING_TOO_SHORT', $requestError->getId()); 203 $this->assertTrue($requestError->hasMessage('en_EN')); 204 $this->assertTrue($requestError->hasMessage('de_DE')); 211 $this->assertTrue($requestError->hasMessage('default')); 212 $this->assertTrue($requestError->hasMessage('en_*')); 213 $this->assertTrue($requestError->hasMessage('de_*')); 205 214 $requestError2 = $rveFactory->create('STRING_TOO_SHORT'); 206 215 $this->assertNotSame($requestError, $requestError2); … … 217 226 $this->assertType('stubRequestValueError', $requestError); 218 227 $this->assertEquals('STRING_TOO_LONG', $requestError->getId()); 219 $this->assertTrue($requestError->hasMessage('en_EN')); 220 $this->assertTrue($requestError->hasMessage('de_DE')); 228 $this->assertTrue($requestError->hasMessage('default')); 229 $this->assertTrue($requestError->hasMessage('en_*')); 230 $this->assertTrue($requestError->hasMessage('de_*')); 221 231 $requestError2 = $rveFactory->create('STRING_TOO_LONG'); 222 232 $this->assertNotSame($requestError, $requestError2); … … 233 243 $this->assertType('stubRequestValueError', $requestError); 234 244 $this->assertEquals('DATE_INVALID', $requestError->getId()); 235 $this->assertTrue($requestError->hasMessage('en_EN')); 236 $this->assertTrue($requestError->hasMessage('de_DE')); 245 $this->assertTrue($requestError->hasMessage('default')); 246 $this->assertTrue($requestError->hasMessage('en_*')); 247 $this->assertTrue($requestError->hasMessage('de_*')); 237 248 $requestError2 = $rveFactory->create('DATE_INVALID'); 238 249 $this->assertNotSame($requestError, $requestError2); … … 249 260 $this->assertType('stubRequestValueError', $requestError); 250 261 $this->assertEquals('DATE_TOO_EARLY', $requestError->getId()); 251 $this->assertTrue($requestError->hasMessage('en_EN')); 252 $this->assertTrue($requestError->hasMessage('de_DE')); 262 $this->assertTrue($requestError->hasMessage('default')); 263 $this->assertTrue($requestError->hasMessage('en_*')); 264 $this->assertTrue($requestError->hasMessage('de_*')); 253 265 $requestError2 = $rveFactory->create('DATE_TOO_EARLY'); 254 266 $this->assertNotSame($requestError, $requestError2); … … 265 277 $this->assertType('stubRequestValueError', $requestError); 266 278 $this->assertEquals('DATE_TOO_LATE', $requestError->getId()); 267 $this->assertTrue($requestError->hasMessage('en_EN')); 268 $this->assertTrue($requestError->hasMessage('de_DE')); 279 $this->assertTrue($requestError->hasMessage('default')); 280 $this->assertTrue($requestError->hasMessage('en_*')); 281 $this->assertTrue($requestError->hasMessage('de_*')); 269 282 $requestError2 = $rveFactory->create('DATE_TOO_LATE'); 270 283 $this->assertNotSame($requestError, $requestError2); … … 281 294 $this->assertType('stubRequestValueError', $requestError); 282 295 $this->assertEquals('MAILADDRESS_INCORRECT', $requestError->getId()); 283 $this->assertTrue($requestError->hasMessage('en_EN')); 284 $this->assertTrue($requestError->hasMessage('de_DE')); 296 $this->assertTrue($requestError->hasMessage('default')); 297 $this->assertTrue($requestError->hasMessage('en_*')); 298 $this->assertTrue($requestError->hasMessage('de_*')); 285 299 $requestError2 = $rveFactory->create('MAILADDRESS_INCORRECT'); 286 300 $this->assertNotSame($requestError, $requestError2); … … 297 311 $this->assertType('stubRequestValueError', $requestError); 298 312 $this->assertEquals('URL_INCORRECT', $requestError->getId()); 299 $this->assertTrue($requestError->hasMessage('en_EN')); 300 $this->assertTrue($requestError->hasMessage('de_DE')); 313 $this->assertTrue($requestError->hasMessage('default')); 314 $this->assertTrue($requestError->hasMessage('en_*')); 315 $this->assertTrue($requestError->hasMessage('de_*')); 301 316 $requestError2 = $rveFactory->create('URL_INCORRECT'); 302 317 $this->assertNotSame($requestError, $requestError2); … … 313 328 $this->assertType('stubRequestValueError', $requestError); 314 329 $this->assertEquals('URL_NOT_AVAILABLE', $requestError->getId()); 315 $this->assertTrue($requestError->hasMessage('en_EN')); 316 $this->assertTrue($requestError->hasMessage('de_DE')); 330 $this->assertTrue($requestError->hasMessage('default')); 331 $this->assertTrue($requestError->hasMessage('en_*')); 332 $this->assertTrue($requestError->hasMessage('de_*')); 317 333 $requestError2 = $rveFactory->create('URL_NOT_AVAILABLE'); 318 334 $this->assertNotSame($requestError, $requestError2);
