Changeset 461 for apps/iphone/superbook/trunk/DotTel_SDK/Classes

Timestamp:

07/12/09 17:10:02 (4 years ago)

Author:

henri

Message:

Changed to use NSLocalizedString and rewrote the strings localization file

Files:

• apps/iphone/superbook/trunk/DotTel_SDK/Classes/DnsResolver.m (modified) (4 diffs)

apps/iphone/superbook/trunk/DotTel_SDK/Classes/DnsResolver.m

@@ -184 +184 @@
         if (!ldnsdomain) {
                 //NSLog(@"Can't do ldns_dname_new_frm_str");
-                dict = [NSDictionary dictionaryWithObject:LocStr(@"DNS Error: Can't parse resolver name") forKey:NSLocalizedDescriptionKey];
+                dict = [NSDictionary dictionaryWithObject:NSLocalizedString(@"DNS Error: Can't parse resolver name", @"DNS Error resolver parsing") forKey:NSLocalizedDescriptionKey];
                 err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_NO_NAME userInfo:dict];
                 if (error)
@@ -208 +208 @@
                         if (!p)  {
                                 //NSLog(@"Can't do ldns_resolver_query");
-                                dict = [NSDictionary dictionaryWithObject:LocStr(@"Network Error: No Internet Connection") forKey:NSLocalizedDescriptionKey];
+                                dict = [NSDictionary dictionaryWithObject:NSLocalizedString(@"Network Error: No Internet Connection", @"Network error, no net connect") forKey:NSLocalizedDescriptionKey];
                                 err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_NO_CONNECTION userInfo:dict];
                                 if (error)
@@ -228 +228 @@
                                 //NSLog(@" *** invalid answer name after query\n");
                                 if (ldns_pkt_get_rcode(p) == LDNS_RCODE_NXDOMAIN) {
-                                        dict = [NSDictionary dictionaryWithObject:LocStr(@"Domain does not exist") forKey:NSLocalizedDescriptionKey];
+                                        dict = [NSDictionary dictionaryWithObject:NSLocalizedString(@"Domain does not exist", @"Non-existent domain") forKey:NSLocalizedDescriptionKey];
                                         err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_NXDOMAIN userInfo:dict];
                                 } else {
-                                        dict = [NSDictionary dictionaryWithObject:LocStr(@"Data Error: Invalid answer") forKey:NSLocalizedDescriptionKey];
+                                        dict = [NSDictionary dictionaryWithObject:NSLocalizedString(@"Data Error: Invalid answer", @"Data Error: Invalid answer") forKey:NSLocalizedDescriptionKey];
                                         err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_INVALID_ANSWER userInfo:dict];
                                 }
@@ -250 +250 @@
                                 // In the meantime, disable the error
                                 
-//                              dict = [NSDictionary dictionaryWithObject:LocStr(@"Network Error: Bad data returned") forKey:NSLocalizedDescriptionKey];
+//                              dict = [NSDictionary dictionaryWithObject:NSLocalizedString(@"Network Error: Bad data returned", @"Network Error: Bad data returned") forKey:NSLocalizedDescriptionKey];
 //                              err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_BAD_DATA userInfo:dict];
 //                              if (error)