Some use of compound i18n messages

gallery · Sep 24, 2003 · 84ad78d · 84ad78d
1 parent 0f3d58b
commit 84ad78d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/com/gallery/GalleryRemote/MainFrame.java b/com/gallery/GalleryRemote/MainFrame.java
@@ -315,7 +315,7 @@ && getCurrentAlbum().sizePictures() > 0
 					&& currentGallery.getComm(jStatusBar).isLoggedIn()) {
 					jLoginButton.setText(grRes.getString("Log_out"));
 				} else {
-					jLoginButton.setText("Log in");
+					jLoginButton.setText(grRes.getString("Log_in"));
 				}
 
 				// if the selected album is uploading, disable everything
@@ -352,17 +352,18 @@ && getCurrentAlbum().sizePictures() > 0
 				if ( getCurrentAlbum() == null) {
 					jPictureInspector.setPictures( null );
 
-					jStatusBar.setStatus("Select a Gallery URL and click Log in..." );
+					jStatusBar.setStatus(grRes.getString("notLogged") );
 				} else if ( getCurrentAlbum().sizePictures() > 0 ) {
 					jPictureInspector.setPictures( jPicturesList.getSelectedValues() );
 
 					int selN = jPicturesList.getSelectedIndices().length;
 
+                    String statusMsg;
+                    Object [] params = {new Integer(getCurrentAlbum().sizePictures()),
+                                        new Integer((int)(getCurrentAlbum().getPictureFileSize() / 1024))};
+
 					if ( sel == -1 ) {
-						jStatusBar.setStatus(getCurrentAlbum().sizePictures() + " pictures / "
-						+ NumberFormat.getInstance().format(
-						( (int) getCurrentAlbum().getPictureFileSize() / 1024 ) )
-						+ " K" );
+						jStatusBar.setStatus(grRes.getString("statusBarNoSel", params ));
 					} else {
 						jStatusBar.setStatus("Selected " + selN + ((selN == 1)?" picture / ":" pictures / ")
 						+ NumberFormat.getInstance().format(

diff --git a/com/gallery/GalleryRemote/resources/GRResources.properties b/com/gallery/GalleryRemote/resources/GRResources.properties
@@ -1,2 +1,5 @@
-Log_out = Log Out
-Select_Album = Select Album
+MainFrame.Log_out = Log out
+MainFrame.Log_in = Log in
+MainFrame.notLogged = Select a Gallery URL and click Log in...
+MainFrame.statusBarNoSel = {0, number, integer} pictures / {1, number , integer} K
+