modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java | 5 ++++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 2 +- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 2 +- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 2 +- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-)
New commits: commit e7b28ef223111938258c454ce6b48a4e40fd9dad Author: Simeon Pinder spinder@redhat.com Date: Fri Oct 28 15:07:16 2011 -0400
Fixing productization issue for new LDAP registration.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java index d691e0e..74d11e3 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LoginView.java @@ -59,6 +59,7 @@ import com.smartgwt.client.widgets.form.validator.RegExpValidator; import com.smartgwt.client.widgets.layout.HStack;
import org.rhq.core.domain.auth.Subject; +import org.rhq.core.domain.common.ProductInfo; import org.rhq.core.domain.resource.ResourceType; import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; @@ -205,12 +206,14 @@ public class LoginView extends LocatableCanvas { if (!loginShowing) { loginShowing = true;
+ ProductInfo productInfo = CoreGUI.get().getProductInfo(); + int fieldWidth = 120;
LocatableVLayout column = new LocatableVLayout(extendLocatorId("NewLdapRegistration")); column.setMargin(25); HeaderItem header = new HeaderItem(); - header.setValue(MSG.view_login_welcomeMsg()); + header.setValue(MSG.view_login_welcomeMsg(productInfo.getName())); header.setWidth("100%"); //build ui elements for registration screen first = new TextItem(FIRST, MSG.dataSource_users_field_firstName()); diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties index dd0902e..623cab9 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties @@ -1500,7 +1500,7 @@ view_login_prompt = Please Login view_login_registerLater = (Cancel - Complete registration later.) view_login_registerLdapSuccess = Successfully registered the new LDAP User. view_login_registerUser = Register User -view_login_welcomeMsg = Welcome to RHQ! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK", you will be logged in.<br/><br/> +view_login_welcomeMsg = Welcome to {0}! <br/><br/> Enter/update the following fields to complete your registration process.<br/> Once you click "OK", you will be logged in.<br/><br/> view_measureRange_last = Time Range - Previous view_measureRange_simple = Simple... view_measureRange_start = Time Range - Start diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 3050a0f..5d771db 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1490,7 +1490,7 @@ view_login_prompt = ログインしてください view_login_registerLater = (キャンセル - 登録を後で完成させてください) view_login_registerLdapSuccess = 新しいLDAPユーザーの登録に成功しました view_login_registerUser = ユーザの登録 -view_login_welcomeMsg = RHQへようこそ! <br/><br/> 登録を完成させるために次のフィールドを入力/更新してください。<br/> "OK"をクリックしたら、ログインします。<br/><br/> +##view_login_welcomeMsg = RHQへようこそ! <br/><br/> 登録を完成させるために次のフィールドを入力/更新してください。<br/> "OK"をクリックしたら、ログインします。<br/><br/> view_measureRange_last = 時間の範囲 - 直前 view_measureRange_simple = シンプル... view_measureRange_start = 時間の範囲 - 開始 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 2814a9b..f068b02 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -1522,7 +1522,7 @@ view_login_prompt = Favor efetuar Login view_login_registerLater = (Sair - Concluir registro mais tarde.) view_login_registerLdapSuccess = Novo usu\u00E1rios do LDAP registrado com sucesso. view_login_registerUser = Registrar Usu\u00E1rio -view_login_welcomeMsg = Seja Bem Vindo ao JBoss ON! <br/><br/> Informe ou altere os seguintes campos para completar o processo de registro.<br/> Clique em "OK" para acessar o sistema.<br/><br/> +##view_login_welcomeMsg = Seja Bem Vindo ao JBoss ON! <br/><br/> Informe ou altere os seguintes campos para completar o processo de registro.<br/> Clique em "OK" para acessar o sistema.<br/><br/> view_measureRange_day = 1 Dia view_measureRange_days = {0} Dias view_measureRange_hour = 1 Hora diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 60f3bf7..d7b5409 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -1500,7 +1500,7 @@ view_login_prompt = \u8bf7\u767b\u5f55 view_login_registerLater = (\u53d6\u6d88 - \u7a0d\u540e\u5b8c\u6210\u6ce8\u518c.) view_login_registerLdapSuccess = \u6210\u529f\u6ce8\u518c\u65b0\u7684LDAP\u7528\u6237. view_login_registerUser = \u7528\u6237\u6ce8\u518c -view_login_welcomeMsg = \u6b22\u8fce\u6765\u5230 RHQ! <br/><br/> \u8f93\u5165\u6216\u8005\u4fee\u6539\u4e0b\u9762\u7684\u4fe1\u606f\uff0c\u4ee5\u5b8c\u6210\u6ce8\u518c<br/> \u70b9\u51fb"OK", \u5c31\u53ef\u4ee5\u767b\u5f55\u7cfb\u7edf.<br/><br/> +##view_login_welcomeMsg = \u6b22\u8fce\u6765\u5230 RHQ! <br/><br/> \u8f93\u5165\u6216\u8005\u4fee\u6539\u4e0b\u9762\u7684\u4fe1\u606f\uff0c\u4ee5\u5b8c\u6210\u6ce8\u518c<br/> \u70b9\u51fb"OK", \u5c31\u53ef\u4ee5\u767b\u5f55\u7cfb\u7edf.<br/><br/> view_measureRange_last = \u65f6\u95f4\u8303\u56f4 - \u5148\u524d\u7684 view_measureRange_simple = \u4e00\u822c... view_measureRange_start = \u65f6\u95f4\u8303\u56f4 - \u8d77\u59cb
rhq-commits@lists.fedorahosted.org