You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/06/27 18:41:36 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - log when
locale changes
Repository: flex-utilities
Updated Branches:
refs/heads/develop e1f537200 -> 054b7d9eb
log when locale changes
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/95cc618d
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/95cc618d
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/95cc618d
Branch: refs/heads/develop
Commit: 95cc618d36e92de31d7e5145f6aa9225e40be7a2
Parents: e1f5372
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 27 00:25:06 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 27 00:25:06 2014 -0700
----------------------------------------------------------------------
installer/src/InstallApacheFlex.mxml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/95cc618d/installer/src/InstallApacheFlex.mxml
----------------------------------------------------------------------
diff --git a/installer/src/InstallApacheFlex.mxml b/installer/src/InstallApacheFlex.mxml
index 0ad4767..7767b89 100644
--- a/installer/src/InstallApacheFlex.mxml
+++ b/installer/src/InstallApacheFlex.mxml
@@ -563,7 +563,7 @@ variables are not required because the locations of these pieces are known.
if (languageOverride) {
userLocale = languageOverride;
}
- log("Using Locale:" + userLocale);
+ log("Using Locale: " + userLocale);
var n:int = supportedLanguages.length;
for (var i:int = 0; i < n; i++) {
@@ -2297,6 +2297,7 @@ variables are not required because the locations of these pieces are known.
var defaultLanguage:String = ViewResourceConstants.DEFAULT_LANGUAGE;
resourceManager.localeChain = [ languageID, defaultLanguage ];
resourceManager.update();
+ log("Using Locale: " + languageID);
setButtonWidths();
}
[2/2] git commit: [flex-utilities] [refs/heads/develop] - allow COPY
LOG button to be localized
Posted by ah...@apache.org.
allow COPY LOG button to be localized
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/054b7d9e
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/054b7d9e
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/054b7d9e
Branch: refs/heads/develop
Commit: 054b7d9eb2f3c27d5e2886f8617cc392b028c51f
Parents: 95cc618
Author: Alex Harui <ah...@apache.org>
Authored: Fri Jun 27 00:25:19 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jun 27 00:25:19 2014 -0700
----------------------------------------------------------------------
.../apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml | 2 +-
installer/src/properties/en_US.properties | 1 +
installer/src/properties/zh_CN.properties | 1 +
installer/src/properties/zh_TW.properties | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/054b7d9e/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml
----------------------------------------------------------------------
diff --git a/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml b/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml
index d992d41..977d149 100644
--- a/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml
+++ b/installer/src/org/apache/flex/packageflexsdk/view/components/ConsoleWindow.mxml
@@ -77,7 +77,7 @@ limitations under the License.
<s:VerticalLayout gap="0" horizontalAlign="justify" />
</s:layout>
</s:List>
- <s:Button label="COPY LOG"
+ <s:Button label="{ViewResourceConstants.instance.BTN_LABEL_COPY_LOG}"
click="handleCopyBtnClick(event)"
styleName="genericBtnStyle"
left="7.5"
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/054b7d9e/installer/src/properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/en_US.properties b/installer/src/properties/en_US.properties
index e455391..32549b1 100644
--- a/installer/src/properties/en_US.properties
+++ b/installer/src/properties/en_US.properties
@@ -27,6 +27,7 @@ ASK_SWFOBJECT=The MIT License (MIT) applies to the SWFObject utility. Do you wa
BTN_LABEL_ADOBE_LICENSE=SHOW ADOBE LICENSE
BTN_LABEL_BROWSE=BROWSE
BTN_LABEL_CLOSE=CLOSE
+BTN_LABEL_COPY_LOG=COPY LOG
BTN_LABEL_INSTALL=INSTALL
BTN_LABEL_INSTALL_LOG=INSTALL LOG
BTN_LABEL_MPL_LICENSE=SHOW MPL LICENSE
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/054b7d9e/installer/src/properties/zh_CN.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/zh_CN.properties b/installer/src/properties/zh_CN.properties
index 855a11a..098110b 100755
--- a/installer/src/properties/zh_CN.properties
+++ b/installer/src/properties/zh_CN.properties
@@ -27,6 +27,7 @@ ASK_SWFOBJECT=MIT 许可协议适用于 SWFObject 实用程序. 您想要安装
BTN_LABEL_ADOBE_LICENSE=显示 Adobe 许可协议
BTN_LABEL_BROWSE=浏览
BTN_LABEL_CLOSE=退出
+BTN_LABEL_COPY_LOG=拷贝日志
BTN_LABEL_INSTALL=安装
BTN_LABEL_INSTALL_LOG=安装日志
BTN_LABEL_MPL_LICENSE=显示 MPL 许可协议
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/054b7d9e/installer/src/properties/zh_TW.properties
----------------------------------------------------------------------
diff --git a/installer/src/properties/zh_TW.properties b/installer/src/properties/zh_TW.properties
index 08ebfae..24a26da 100755
--- a/installer/src/properties/zh_TW.properties
+++ b/installer/src/properties/zh_TW.properties
@@ -27,6 +27,7 @@ ASK_SWFOBJECT=MIT 授權合約適用於 SWFObject 實用程式. 您想要安裝
BTN_LABEL_ADOBE_LICENSE=顯示 Adobe 授權合約
BTN_LABEL_BROWSE=流覽
BTN_LABEL_CLOSE=退出
+BTN_LABEL_COPY_LOG=拷貝日誌
BTN_LABEL_INSTALL=安裝
BTN_LABEL_INSTALL_LOG=安裝日誌
BTN_LABEL_MPL_LICENSE=顯示 MPL 授權合約