Mercurial Mercurial > beem > trunk / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Translate more strings for wizard and make error message multilines
authorDa Risk <da_risk@beem-project.com>
Sat, 29 Sep 2012 05:22:11 +0200
changeset 996 476e8690b0ea
parent 995 6318bee856fd
child 997 84b87e059de9
Translate more strings for wizard and make error message multilines
res/layout/create_account.xml file | annotate | diff | comparison | revisions
res/layout/wizard_account_configure.xml file | annotate | diff | comparison | revisions
res/values-fr/strings.xml file | annotate | diff | comparison | revisions
res/values/strings.xml file | annotate | diff | comparison | revisions
src/com/beem/project/beem/ui/wizard/AccountConfigureFragment.java file | annotate | diff | comparison | revisions
src/com/beem/project/beem/ui/wizard/CreateAccountFragment.java file | annotate | diff | comparison | revisions 
--- a/res/layout/create_account.xml	Sat Sep 29 04:47:42 2012 +0200
+++ b/res/layout/create_account.xml	Sat Sep 29 05:22:11 2012 +0200
@@ -39,6 +39,7 @@
 			android:minWidth="160dp"
 		    android:gravity="left"
 		    android:hint="beem-project.com"
+		    android:completionThreshold="1"
 		    android:inputType="textNoSuggestions"
 		    style="?android:attr/dropDownSpinnerStyle"/>
 		</LinearLayout>
@@ -61,6 +62,7 @@
 		<TextView android:id="@+id/error_label"
 				android:layout_width="fill_parent" android:layout_height="wrap_content"
 				android:textColor="@color/red" android:textStyle="bold"
+				android:inputType="textMultiLine"
 				style="@style/Label"/>
 	</LinearLayout>
 	</ScrollView>
--- a/res/layout/wizard_account_configure.xml	Sat Sep 29 04:47:42 2012 +0200
+++ b/res/layout/wizard_account_configure.xml	Sat Sep 29 05:22:11 2012 +0200
@@ -58,6 +58,7 @@
 	    <TextView android:id="@+id/error_label"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"
 		android:text="@string/account_wizard_connection_failed" style="@style/Label"
+		android:inputType="textMultiLine"
 		android:textColor="@color/red"
 		android:visibility="invisible" />
 	</LinearLayout>
--- a/res/values-fr/strings.xml	Sat Sep 29 04:47:42 2012 +0200
+++ b/res/values-fr/strings.xml	Sat Sep 29 05:22:11 2012 +0200
@@ -200,7 +200,9 @@
 		Create an account Activity
 	-->
 	<string name="create_account_text">Entrez les informations nécéssaires pour créer votre compte</string>
-	<string name="create_account_err_username">Mauvais JabberID</string>
+	<string name="create_account_progress_title">Création du compte</string>
+	<string name="create_account_progress_message">Veuillez patientez</string>
+		<string name="create_account_err_username">Mauvais JabberID</string>
 	<string name="create_account_err_passwords">Les mots de passe ne correspondent pas</string>
 	<string name="create_account_username">Nom d\'utilisateur</string>
 	<string name="create_account_password">Mot de passe</string>
--- a/res/values/strings.xml	Sat Sep 29 04:47:42 2012 +0200
+++ b/res/values/strings.xml	Sat Sep 29 05:22:11 2012 +0200
@@ -199,6 +199,8 @@
 
 	<!-- Create an account Activity -->
 	<string name="create_account_text">Enter the required informations to create your account</string>
+	<string name="create_account_progress_title">Account creation</string>
+	<string name="create_account_progress_message">Please wait</string>
 	<string name="create_account_err_username">Bad JabberID</string>
 	<string name="create_account_err_passwords">Passwords do not match.</string>
 	<string name="create_account_username">Username</string>
--- a/src/com/beem/project/beem/ui/wizard/AccountConfigureFragment.java	Sat Sep 29 04:47:42 2012 +0200
+++ b/src/com/beem/project/beem/ui/wizard/AccountConfigureFragment.java	Sat Sep 29 05:22:11 2012 +0200
@@ -414,7 +414,6 @@
 	    Log.d(TAG, "Xmpp login task");
 	    jid = params[0];
 	    password = params[1];
-	    server = StringUtils.parseServer(jid);
 	    Log.d(TAG, "jid " + jid + " server  " + server);
 
 	    int port = -1;
@@ -444,7 +443,7 @@
 	 * Initialize the XMPP connection.
 	 *
 	 * @param jid the jid to use
-	 * @param server the server to use
+	 * @param server the server to use (not using dns srv)  may be null
 	 * @param port the port
 	 *
 	 * @return the XMPPConnection prepared to connect
@@ -501,8 +500,8 @@
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
 	    Log.d(TAG, "create progress dialog");
 	    ProgressDialog p = new ProgressDialog(getActivity());
-	    p.setTitle("Connexion en cours");
-	    p.setMessage("Please wait");
+	    p.setTitle(getString(R.string.login_login_progress));
+	    p.setMessage(getString(R.string.create_account_progress_message));
 	    return p;
 	}
     }
--- a/src/com/beem/project/beem/ui/wizard/CreateAccountFragment.java	Sat Sep 29 04:47:42 2012 +0200
+++ b/src/com/beem/project/beem/ui/wizard/CreateAccountFragment.java	Sat Sep 29 05:22:11 2012 +0200
@@ -263,7 +263,6 @@
 	    Log.d(TAG, "Xmpp login task");
 	    jid = params[0];
 	    password = params[1];
-	    server = StringUtils.parseServer(jid);
 	    Log.d(TAG, "jid " + jid + " server  " + server);
 
 	    int port = -1;
@@ -294,7 +293,7 @@
 	 * Initialize the XMPP connection.
 	 *
 	 * @param jid the jid to use
-	 * @param server the server to use
+	 * @param server the server to use (not using dns srv) may be null
 	 * @param port the port
 	 *
 	 * @return the XMPPConnection prepared to connect
@@ -351,8 +350,8 @@
 	public Dialog onCreateDialog(Bundle savedInstanceState) {
 	    Log.d(TAG, "create progress dialog");
 	    ProgressDialog p = new ProgressDialog(getActivity());
-	    p.setTitle("Creation du compte en cours");
-	    p.setMessage("Please wait");
+	    p.setTitle(getString(R.string.create_account_progress_title));
+	    p.setMessage(getString(R.string.create_account_progress_message));
 	    return p;
 	}
     }
BEEM