Skip to content
Browse files

locale de_DE and its layout handling added

  • Loading branch information...
1 parent 404af22 commit 2278bb135312d70d4eaa17c1158d3cc4028be8b3 @sectore committed Oct 28, 2011
View
17 src/CaltrainTimesScript.as
@@ -751,6 +751,23 @@ public function setLocaleStrings(locale:String, runtime:Boolean = false):void
grpInstructions.lblHelp6.styleName = "alertText2";
grpInstructions.lblFind.styleName = "text2Spanish";
}
+ else if (CaltrainStrings.currentLocale == CaltrainStrings.LOCALE_GERMAN)
+ {
+ grpFrom.lblPrefix.styleName = "text1German";
+ grpFrom.lblEdit.styleName = "editTextGerman";
+ grpFrom.lblStation.styleName = "text1German";
+ grpTo.lblPrefix.styleName = "text1German";
+ grpTo.lblEdit.styleName = "editText";
+ grpTo.lblStation.styleName = "text1German";
+ grpInstructions.lblTitle.styleName = "text1German";
+ grpInstructions.lblHelp1.styleName = "alertText2German";
+ grpInstructions.lblHelp2.styleName = "alertText2German";
+ grpInstructions.lblHelp3.styleName = "alertText2German";
+ grpInstructions.lblHelp4.styleName = "alertText2German";
+ grpInstructions.lblHelp5.styleName = "alertText2German";
+ grpInstructions.lblHelp6.styleName = "alertText2German";
+ grpInstructions.lblFind.styleName = "text2";
+ }
else
{
grpFrom.lblPrefix.styleName = "text1";
View
100 src/assets/styles.css
@@ -20,14 +20,21 @@ ree|SpinnerDataGroup
skinClass: ClassReference("com.renaun.skins.mobile.SpinnerDataGroupSkin");
}
+
@font-face
{
src: url("/assets/fonts/HelveticaNeueBoldCondObl.otf");
fontFamily: myHelveNeueBolConObl;
font-style: italic;
font-weight: bold;
embedAsCFF: true;
- unicodeRange: U+0041-U+007F;
+ unicodeRange: U+0041-U+007F,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@@ -37,7 +44,13 @@ ree|SpinnerDataGroup
fontFamily: myHelveBol;
advancedAntiAliasing : false;
embedAsCFF: true;
- unicodeRange: U+0041-U+007F;
+ unicodeRange: U+0041-U+007F,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@font-face
@@ -46,7 +59,13 @@ ree|SpinnerDataGroup
fontFamily: myHelveNeueBlkCn;
advancedAntiAliasing : false;
embedAsCFF: true;
- unicodeRange: U+0020-U+007F;
+ unicodeRange: U+0020-U+007F,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@@ -57,7 +76,13 @@ ree|SpinnerDataGroup
advancedAntiAliasing : false;
embedAsCFF: true;
unicodeRange: U+0020-U+007F,
- U+000a, U+0020-U+0021, U+002c-U+002f, U+00a1, U+00e1, U+00ed, U+00f3, U+00fa;
+ U+000a, U+0020-U+0021, U+002c-U+002f, U+00a1, U+00e1, U+00ed, U+00f3, U+00fa,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@font-face
{
@@ -66,7 +91,13 @@ ree|SpinnerDataGroup
advancedAntiAliasing : false;
embedAsCFF: false;
unicodeRange: U+0020-U+007F,
- U+000a, U+0020-U+0021, U+002c-U+002f, U+00a1, U+00e1, U+00ed, U+00f3, U+00fa;
+ U+000a, U+0020-U+0021, U+002c-U+002f, U+00a1, U+00e1, U+00ed, U+00f3, U+00fa,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@font-face
@@ -76,7 +107,13 @@ ree|SpinnerDataGroup
advancedAntiAliasing : false;
embedAsCFF: true;
unicodeRange: U+0030-U+007F, U+0027,
- U+000a, U+0020-U+0021, U+002c-U+002f, U+00a1, U+00e1, U+00ed, U+00f3, U+00fa;
+ U+000a, U+0020-U+0021, U+002c-U+002f, U+00a1, U+00e1, U+00ed, U+00f3, U+00fa,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@@ -87,7 +124,13 @@ ree|SpinnerDataGroup
advancedAntiAliasing: false;
embedAsCFF: false;
unicodeRange: U+0024-U+007F,
- U+000a, U+0020-U+0021, U+002c-U+002f, U+00a1, U+00e1, U+00ed, U+00f3, U+00fa;
+ U+000a, U+0020-U+0021, U+002c-U+002f, U+00a1, U+00e1, U+00ed, U+00f3, U+00fa,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@font-face
@@ -98,7 +141,13 @@ ree|SpinnerDataGroup
advancedAntiAliasing: false;
embedAsCFF: true;
unicodeRange: U+0024, U+003A, U+002E, U+0030-U+0039, U+000a, U+0020, U+0023, U+002d, U+0047, U+0050, U+0053,
- U+3002, U+4e00, U+4e0a-U+4e0b, U+4e0d, U+4e2d, U+4e4b, U+4e58, U+4ece, U+4ee5, U+4ef7, U+4f1a, U+4f4d, U+4f7f, U+51fa-U+51fb, U+5206, U+5217, U+5230, U+523b, U+524d, U+529f-U+52a1, U+5317, U+5348, U+5357, U+53d1, U+53d6, U+53eb, U+53f3, U+540e, U+542f, U+5468, U+56fe, U+5728, U+5730, U+591a, U+592a, U+5982, U+5b9a, U+5ba2, U+5bfb, U+5c0f, U+5dde, U+5e73, U+5e8f, U+5e94, U+5feb, U+60a8, U+6109, U+611f, U+6162, U+6216, U+627e, U+62e9, U+6301, U+6389, U+63d0, U+652f, U+65c5, U+65e5, U+65f6, U+662f, U+663e, U+66f4, U+6700, U+6709, U+670d, U+672b, U+679c, U+67e5, U+6807, U+68c0, U+6b22, U+706b, U+70b9, U+7136, U+7528, U+7684, U+76ee, U+793a, U+795d, U+7968, U+7a0b, U+7ad9, U+7ebf, U+7ec6, U+7f16, U+7f6e, U+80fd, U+8282, U+83b7, U+884c, U+8868, U+8981, U+89d2, U+8bbe, U+8bd5, U+8bdd, U+8bf7, U+8c22, U+8def, U+8f66, U+8f6c, U+8f91, U+8fbe, U+8fce, U+8fd1, U+9009, U+9014, U+949f, U+95f4, U+9e23, U+ff01, U+ff0c, U+ff1a;
+ U+3002, U+4e00, U+4e0a-U+4e0b, U+4e0d, U+4e2d, U+4e4b, U+4e58, U+4ece, U+4ee5, U+4ef7, U+4f1a, U+4f4d, U+4f7f, U+51fa-U+51fb, U+5206, U+5217, U+5230, U+523b, U+524d, U+529f-U+52a1, U+5317, U+5348, U+5357, U+53d1, U+53d6, U+53eb, U+53f3, U+540e, U+542f, U+5468, U+56fe, U+5728, U+5730, U+591a, U+592a, U+5982, U+5b9a, U+5ba2, U+5bfb, U+5c0f, U+5dde, U+5e73, U+5e8f, U+5e94, U+5feb, U+60a8, U+6109, U+611f, U+6162, U+6216, U+627e, U+62e9, U+6301, U+6389, U+63d0, U+652f, U+65c5, U+65e5, U+65f6, U+662f, U+663e, U+66f4, U+6700, U+6709, U+670d, U+672b, U+679c, U+67e5, U+6807, U+68c0, U+6b22, U+706b, U+70b9, U+7136, U+7528, U+7684, U+76ee, U+793a, U+795d, U+7968, U+7a0b, U+7ad9, U+7ebf, U+7ec6, U+7f16, U+7f6e, U+80fd, U+8282, U+83b7, U+884c, U+8868, U+8981, U+89d2, U+8bbe, U+8bd5, U+8bdd, U+8bf7, U+8c22, U+8def, U+8f66, U+8f6c, U+8f91, U+8fbe, U+8fce, U+8fd1, U+9009, U+9014, U+949f, U+95f4, U+9e23, U+ff01, U+ff0c, U+ff1a,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@font-face
@@ -109,7 +158,13 @@ ree|SpinnerDataGroup
advancedAntiAliasing: false;
embedAsCFF: false;
unicodeRange: U+0024, U+003A, U+002E, U+0030-U+0039, U+000a, U+0020, U+0023, U+002d, U+0047, U+0050, U+0053,
- U+3002, U+4e00, U+4e0a-U+4e0b, U+4e0d, U+4e2d, U+4e4b, U+4e58, U+4ece, U+4ee5, U+4ef7, U+4f1a, U+4f4d, U+4f7f, U+51fa-U+51fb, U+5206, U+5217, U+5230, U+523b, U+524d, U+529f-U+52a1, U+5317, U+5348, U+5357, U+53d1, U+53d6, U+53eb, U+53f3, U+540e, U+542f, U+5468, U+56fe, U+5728, U+5730, U+591a, U+592a, U+5982, U+5b9a, U+5ba2, U+5bfb, U+5c0f, U+5dde, U+5e73, U+5e8f, U+5e94, U+5feb, U+60a8, U+6109, U+611f, U+6162, U+6216, U+627e, U+62e9, U+6301, U+6389, U+63d0, U+652f, U+65c5, U+65e5, U+65f6, U+662f, U+663e, U+66f4, U+6700, U+6709, U+670d, U+672b, U+679c, U+67e5, U+6807, U+68c0, U+6b22, U+706b, U+70b9, U+7136, U+7528, U+7684, U+76ee, U+793a, U+795d, U+7968, U+7a0b, U+7ad9, U+7ebf, U+7ec6, U+7f16, U+7f6e, U+80fd, U+8282, U+83b7, U+884c, U+8868, U+8981, U+89d2, U+8bbe, U+8bd5, U+8bdd, U+8bf7, U+8c22, U+8def, U+8f66, U+8f6c, U+8f91, U+8fbe, U+8fce, U+8fd1, U+9009, U+9014, U+949f, U+95f4, U+9e23, U+ff01, U+ff0c, U+ff1a;
+ U+3002, U+4e00, U+4e0a-U+4e0b, U+4e0d, U+4e2d, U+4e4b, U+4e58, U+4ece, U+4ee5, U+4ef7, U+4f1a, U+4f4d, U+4f7f, U+51fa-U+51fb, U+5206, U+5217, U+5230, U+523b, U+524d, U+529f-U+52a1, U+5317, U+5348, U+5357, U+53d1, U+53d6, U+53eb, U+53f3, U+540e, U+542f, U+5468, U+56fe, U+5728, U+5730, U+591a, U+592a, U+5982, U+5b9a, U+5ba2, U+5bfb, U+5c0f, U+5dde, U+5e73, U+5e8f, U+5e94, U+5feb, U+60a8, U+6109, U+611f, U+6162, U+6216, U+627e, U+62e9, U+6301, U+6389, U+63d0, U+652f, U+65c5, U+65e5, U+65f6, U+662f, U+663e, U+66f4, U+6700, U+6709, U+670d, U+672b, U+679c, U+67e5, U+6807, U+68c0, U+6b22, U+706b, U+70b9, U+7136, U+7528, U+7684, U+76ee, U+793a, U+795d, U+7968, U+7a0b, U+7ad9, U+7ebf, U+7ec6, U+7f16, U+7f6e, U+80fd, U+8282, U+83b7, U+884c, U+8868, U+8981, U+89d2, U+8bbe, U+8bd5, U+8bdd, U+8bf7, U+8c22, U+8def, U+8f66, U+8f6c, U+8f91, U+8fbe, U+8fce, U+8fd1, U+9009, U+9014, U+949f, U+95f4, U+9e23, U+ff01, U+ff0c, U+ff1a,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
@font-face
@@ -118,7 +173,13 @@ ree|SpinnerDataGroup
fontFamily: myHelveNeueRoman;
advancedAntiAliasing : false;
embedAsCFF: true;
- unicodeRange: U+0041-U+007F;
+ unicodeRange: U+0041-U+007F,
+ U+00C4, /* € */
+ U+00E4, /* Š */
+ U+00D6, /* … */
+ U+00F6, /* š */
+ U+00DC, /* † */
+ U+00FC; /* Ÿ */
}
global
@@ -146,22 +207,23 @@ global
skinClass: ClassReference("com.renaun.caltrain.skins.BlackBoxSkin");
}
/* greyed out 4d4d4d */
-.text1, .text1Chinese, .text1Spanish
+.text1, .text1Chinese, .text1Spanish, .text1German
{
color: #c0c0c0;
font-size: 18;
font-family: myHelveNeueBdCn;
}
-.text2, .text2Spanish
+.text2, .text2Spanish, .text2German
{
color: #ffffff;
font-size: 18;
font-family: myHelveNeueLtCn;
}
.text1Chinese, .text2Chinese { font-size: 16; font-family: myAdobeHeitiStd }
.text1Spanish, .text2Spanish { font-size: 14; }
+.text1German, .text2German { font-size: 14; }
-.alertText2, .alertText2Chinese { color: #ffffff; font-family: myHelveNeueLtCn; font-size: 14px; }
+.alertText2, .alertText2Chinese, .alertText2German { color: #ffffff; font-family: myHelveNeueLtCn; font-size: 14px; }
.alertText { color: #ffffff; font-family: myHelveNeueLtCn2; font-size: 14px; }
.alertHeader { color: #a10c11; font-family: myHelveNeueBlkCn; font-size: 14px; }
.alertText2Button { color: #ffffff; font-family: myHelveNeueLtCn2; font-size: 14px;
@@ -216,16 +278,20 @@ ct|StationBlackBox .textDisabled { color: #4d4d4d; }
ct|StationBlackBox .text2, ct|StationBlackBox .text1 { font-size: 18; }
.editText { font-size: 12;paddingTop:2px }
.editTextChinese { font-size: 12;paddingTop:2px }
+ .editTextGerman { font-size: 10;paddingTop:3px }
.weekText { font-size: 12; paddingLeft: 16; paddingRight: 16; }
.text1, .text2, .stationText1 { font-size: 18; paddingTop: 4; }
.text1Chinese, .text2Chinese { font-size: 16; paddingTop: 2; }
.text1Spanish, .text2Spanish { font-size: 14; paddingTop: 2; }
+ .text1German { font-size: 16; paddingTop: 3; }
+ .text2German { font-size: 14; paddingTop: 2; }
.stationText2 { font-size: 18; }
.resultsQuick { font-size: 14; paddingTop: 4; paddingLeft: 4; paddingRight: 24; }
.resultsQuickChinese { font-size: 12; paddingTop: 4; paddingLeft: 4; paddingRight: 24; }
.resultsChinese { font-size: 12; paddingTop: 6; }
.resultsHeader, .results, .resultsEmbed { font-size: 14; paddingTop: 6; }
.alertText, .alertText2, .alertHeader, .alertText2Button, .alertText2Chinese { font-size: 14; }
+ .alertText2German { font-size: 12; }
}
@media (application-dpi: 240)
@@ -234,16 +300,20 @@ ct|StationBlackBox .textDisabled { color: #4d4d4d; }
ct|StationBlackBox .text2, ct|StationBlackBox .text1 { font-size: 27; }
.editText { font-size: 16;paddingTop:3px }
.editTextChinese { font-size: 16;paddingTop:3px }
+ .editTextGerman { font-size: 14;paddingTop:4px }
.weekText { font-size: 18; paddingLeft: 24; paddingRight: 24; }
.text1, .text2, .stationText1 { font-size: 27; paddingTop: 6; }
.text1Chinese, .text2Chinese { font-size: 24; paddingTop: 4; }
.text1Spanish, .text2Spanish { font-size: 21; paddingTop: 4; }
+ .text1German { font-size: 24; paddingTop: 4; }
+ .text2German { font-size: 21; paddingTop: 4; }
.stationText2 { font-size: 27; }
.resultsQuick { font-size: 21; paddingTop: 6; paddingLeft: 6; paddingRight: 36; }
.resultsQuickChinese { font-size: 18; paddingTop: 6; paddingLeft: 6; paddingRight: 36; }
.resultsChinese { font-size: 18; paddingTop: 8; }
.resultsHeader, .results, .resultsEmbed { font-size: 21; paddingTop: 8; }
.alertText, .alertText2, .alertHeader, .alertText2Button, .alertText2Chinese { font-size: 21; }
+ .alertText2German { font-size: 18; }
}
@media (application-dpi: 320)
@@ -252,15 +322,19 @@ ct|StationBlackBox .textDisabled { color: #4d4d4d; }
ct|StationBlackBox .text2, ct|StationBlackBox .text1 { font-size: 36; }
.editText { font-size: 24;paddingTop:5px }
.editTextChinese { font-size: 24;paddingTop:5px }
+ .editTextGerman { font-size: 22;paddingTop:6px }
.weekText { font-size: 24; paddingLeft: 32; paddingRight: 32; }
.text1, .text2, .stationText1 { font-size: 36; paddingTop: 8; }
.text1Chinese, .text2Chinese { font-size: 32; paddingTop: 6; }
.text1Spanish, .text2Spanish { font-size: 28; paddingTop: 6; }
+ .text1German { font-size: 32; paddingTop: 8; }
+ .text2German { font-size: 28; paddingTop: 6; }
.stationText2 { font-size: 36; }
.resultsQuick { font-size: 28; paddingTop: 8; paddingLeft: 8; paddingRight: 48; }
.resultsQuickChinese { font-size: 24; paddingTop: 8; paddingLeft: 8; paddingRight: 48; }
.resultsChinese { font-size: 24; paddingTop: 10; }
.resultsHeader, .results, .resultsEmbed { font-size: 28; paddingTop: 10; }
.alertText, .alertText2, .alertHeader, .alertText2Button, .alertText2Chinese { font-size: 28; }
+ .alertText2German { font-size: 24; }
}
View
8 src/com/renaun/caltrain/components/InstructionView.mxml
@@ -51,12 +51,14 @@
</s:layout>
<s:HGroup id="lblLanguage" width="100%" verticalAlign="middle">
- <s:Button label="中文" styleName="alertText2Button" color="0xc0c0c0" width="33%"
+ <s:Button label="中文" styleName="alertText2Button" color="0xc0c0c0" width="20%"
click="(parentApplication as CaltrainTimes).setLocaleStrings(CaltrainStrings.LOCALE_CHINESE, true)" />
- <s:Button label="English" styleName="alertText2Button" color="0xc0c0c0" width="34%"
+ <s:Button label="English" styleName="alertText2Button" color="0xc0c0c0" width="26%"
click="(parentApplication as CaltrainTimes).setLocaleStrings(CaltrainStrings.LOCALE_ENGLISH, true)" />
- <s:Button label="español" styleName="alertText2Button" color="0xc0c0c0" width="33%"
+ <s:Button label="español" styleName="alertText2Button" color="0xc0c0c0" width="27%"
click="(parentApplication as CaltrainTimes).setLocaleStrings(CaltrainStrings.LOCALE_SPANISH, true)" />
+ <s:Button label="Deutsch" styleName="alertText2Button" color="0xc0c0c0" width="27%"
+ click="(parentApplication as CaltrainTimes).setLocaleStrings(CaltrainStrings.LOCALE_GERMAN, true)" />
</s:HGroup>
<s:Label id="lblTitle" text="Welcome to the Caltrain Times App" styleName="text1" color="0xffffff"/>
View
1 src/com/renaun/caltrain/model/CaltrainStrings.as
@@ -74,6 +74,7 @@ public class CaltrainStrings
public static const LOCALE_ENGLISH:String = "en_US";
public static const LOCALE_CHINESE:String = "zh_CH";
public static const LOCALE_SPANISH:String = "es_ES";
+ public static const LOCALE_GERMAN:String = "de_DE";
}

1 comment on commit 2278bb1

@renaun
renaun commented on 2278bb1 Oct 28, 2011

I dont see the /assets/locale/de_DE/strings file in this commit, am i just missing something?
The rest looks good.

Please sign in to comment.
Something went wrong with that request. Please try again.