Thread: [ifolder-svn] SF.net SVN: ifolder:[7291] trunk/ifolder/src/UI/Mac/OSXClient

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7291
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7291&view=rev
Author:   satyam90
Date:     2010-02-10 13:32:03 +0000 (Wed, 10 Feb 2010)

Log Message:
-----------
Fixed problem of showing correct version of client when showing update dialog

Modified Paths:
--------------
    trunk/ifolder/src/UI/Mac/OSXClient/English.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/src/iFolderData.m

Modified: trunk/ifolder/src/UI/Mac/OSXClient/English.lproj/Localizable.strings
===================================================================

--- trunk/ifolder/src/UI/Mac/OSXClient/English.lproj/Localizable.strings	2010-02-10 13:28:13 UTC (rev 7290)
+++ trunk/ifolder/src/UI/Mac/OSXClient/English.lproj/Localizable.strings	2010-02-10 13:32:03 UTC (rev 7291)
@@ -865,7 +865,7 @@
 "Client Upgrade Available" = "Client Upgrade Available";
 
 /*UpgradeAvailableTitle*/
-"Would you like to upgrade your client to 3.8.0.0? If you click Yes, the latest DMG is downloaded to your system and client is closed automatically.\nYou must then click the downloaded DMG to proceed with the installation." = "Would you like to upgrade your client to 3.8.0.0? If you click Yes, the latest DMG is downloaded to your system and client is closed automatically.\nYou must then click the downloaded DMG to proceed with the installation.";
+"Would you like to upgrade your client to %@? If you click Yes, the latest DMG is downloaded to your system and client is closed automatically.\nYou must then click the downloaded DMG to proceed with the installation." = "Would you like to upgrade your client to %@? If you click Yes, the latest DMG is downloaded to your system and client is closed automatically.\nYou must then click the downloaded DMG to proceed with the installation.";
 
 /*Download latest client title*/
 "Browse the Location" = "Browse the Location";

Modified: trunk/ifolder/src/UI/Mac/OSXClient/src/iFolderData.m
===================================================================
--- trunk/ifolder/src/UI/Mac/OSXClient/src/iFolderData.m	2010-02-10 13:28:13 UTC (rev 7290)
+++ trunk/ifolder/src/UI/Mac/OSXClient/src/iFolderData.m	2010-02-10 13:32:03 UTC (rev 7291)
@@ -1536,7 +1536,7 @@
 	cliUpdate = nil;
 	forceQuit = NO;
 	
-	//Satya: Variables needed to handle upgrade client
+	//Variables needed to handle upgrade client
 	NSString* dirName;
 	int loopCount;
 	int result;
@@ -1602,7 +1602,7 @@
 		case UpgradeNeeded:
 		
 			 //Client upgrade is mandatory. So just logout the domain
-			//Satya: Alert can be handled this way also
+			//Alert can be handled this way also
 			/*NSBeginAlertSheet(NSLocalizedString(@"Client upgrade available.",@"UpgradeAvailableTitle"),
 							  NSLocalizedString(@"OK",@"OK Button"),
 							  NSLocalizedString(@"Cancel",@"Cancel"),
@@ -1620,9 +1620,10 @@
 									 NSLocalizedString(@"OK",@"OK Button"),
 									 nil,nil);
 			*/
-			//Satya: Actual message to display for upgrade available and handling it.
+			//Actual message to display for upgrade available and handling it.
+
 			answer = NSRunAlertPanel(NSLocalizedString(@"Client Upgrade Available",@"UpgradeAvailableTitle"),
-									 [NSString stringWithFormat:NSLocalizedString(@"Would you like to upgrade your client to 3.8.0.0? If you click Yes, the latest DMG is downloaded to your system and client is closed automatically.\nYou must then click the downloaded DMG to proceed with the installation.",@"UpgradeAvailableTitle"),[cliUpdate ServerVersion]],
+									 [NSString stringWithFormat:NSLocalizedString(@"Would you like to upgrade your client to %@? If you click Yes, the latest DMG is downloaded to your system and client is closed automatically.\nYou must then click the downloaded DMG to proceed with the installation.",@"UpgradeAvailableTitle"),[cliUpdate ServerVersion]],
 									 NSLocalizedString(@"Yes",@"Yes"),
 									 NSLocalizedString(@"No",@"No"),nil);
 			
@@ -1696,7 +1697,7 @@
 			
 		case UpgradeAvailable:
 			//Latest upgrade available and can or cannot download. Still the current one runs
-			/*Satya: Alert can be handled this way also
+			/*Alert can be handled this way also
 			NSBeginAlertSheet(NSLocalizedString(@"Client upgrade available.",@"UpgradeAvailableTitle"),
 			NSLocalizedString(@"OK",@"OK Button"),
 			NSLocalizedString(@"Cancel",@"Cancel"),
@@ -1716,7 +1717,7 @@
 									 nil,nil);
 			*/
 			answer = NSRunAlertPanel(NSLocalizedString(@"Client Upgrade Available",@"UpgradeAvailableTitle"),
-									 [NSString stringWithFormat:NSLocalizedString(@"Would you like to upgrade your client to 3.8.0.0? If you click Yes, the latest DMG is downloaded to your system and client is closed automatically.\nYou must then click the downloaded DMG to proceed with the installation.",@"UpgradeAvailableTitle"),[cliUpdate ServerVersion]],
+									 [NSString stringWithFormat:NSLocalizedString(@"Would you like to upgrade your client to %@? If you click Yes, the latest DMG is downloaded to your system and client is closed automatically.\nYou must then click the downloaded DMG to proceed with the installation.",@"UpgradeAvailableTitle"),[cliUpdate ServerVersion]],
 									 NSLocalizedString(@"Yes",@"Yes"),
 									 NSLocalizedString(@"No",@"No"),nil);
 			


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


