Changeset 483 for apps/iphone/superbook

Timestamp:

07/28/09 12:13:39 (4 years ago)

Author:

henri

Message:

Allow for choosing relative positions of LIH and ServiceType? in localization

Location:

apps/iphone/superbook/trunk/DotTel_SDK

Files:

• Classes/RecordNaptr.m (modified) (3 diffs)
• English.lproj/DotTel.strings (modified) (1 diff)
• French.lproj/DotTel.strings (modified) (1 diff)
• Russian.lproj/DotTel.strings (modified) (1 diff)

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

@@ -32 +32 @@
 - (void)parseServices:(NSString *)services;
 - (BOOL)tokenIsLih:(NSString *)token;
+- (void)appendLIHToDescription:(NSMutableString *)theDesc;
+- (void)appendServiceToDescription:(NSMutableString *)theDesc;
 - (NSString *)generateServiceDescription;
 - (NSString *)generateLabelDescription;
@@ -194 +196 @@
 }
 
-- (NSString *)generateServiceDescription {
-        // Create the service description string, concatenating all service types and LIH
-        NSMutableString *theDesc = [[[NSMutableString alloc] initWithCapacity:30] autorelease];
-        NSMutableString *servicePart = [NSMutableString stringWithString:@""];
-
-        if (! isTerminal) {
-                [theDesc appendFormat:@"%@:", LocTelStr(@"ntn")];
-                return theDesc;
-        }
-        
+- (void)appendLIHToDescription:(NSMutableString *)theDesc {
         NSString *aPart;
-        NSInteger i = 0, j = 0; // i is # of LIH, j is # of service types
-        // Start with LIH
+        NSInteger i = 0;
         for (aPart in lihArray) {
                 if (i == 0) {
-                        [theDesc setString:LocTelStr(aPart)];
+                        [theDesc appendString:LocTelStr(aPart)];
                 } else {
-                        [theDesc appendFormat:@" and %@", LocTelStr(aPart)];
+                        [theDesc appendFormat:@" & %@", LocTelStr(aPart)];
                 }
                 i++;
-        }
-        // Add a separator between LIH and service if there are LIH
-        if (i > 0) {
-                [theDesc appendString:@" "];
-        }
-
-        i = 0;
+        }       
+}
+
+- (void)appendServiceToDescription:(NSMutableString *)theDesc {
+        NSString *aPart;
+        NSMutableString *servicePart = [NSMutableString stringWithString:@""];
+        NSInteger i = 0;
+        NSInteger j = 0;
         for (aPart in serviceTypeArray) {
                 NSMutableString *strVal = [NSMutableString stringWithString:LocTelStr(aPart)];
@@ -248 +241 @@
         }
         [theDesc appendString:servicePart];
+}
+
+- (NSString *)generateServiceDescription {
+        // Create the service description string, concatenating all service types and LIH
+        NSMutableString *theDesc = [[[NSMutableString alloc] initWithCapacity:30] autorelease];
+
+        if (! isTerminal) {
+                [theDesc appendFormat:@"%@:", LocTelStr(@"ntn")];
+                return theDesc;
+        }
+        
+        BOOL startWithLIH = [LocTelStr(@"LIH Position") isEqualToString:@"1"];
+        if (startWithLIH) {
+                [self appendLIHToDescription:theDesc];
+                // Add a separator between LIH and service if there are LIH
+                if ([theDesc length] > 0) {
+                        [theDesc appendString:@" "];
+                }
+                [self appendServiceToDescription:theDesc];
+        } else {
+                [self appendServiceToDescription:theDesc];
+                [theDesc appendString:@" "];
+                NSInteger dl = [theDesc length];
+                [self appendLIHToDescription:theDesc];
+                if ([theDesc length] == dl) { // no LIH, remove the last space
+                        [theDesc deleteCharactersInRange:NSMakeRange(dl-1, 1)];
+                }
+        }
+
         return theDesc;
 }

apps/iphone/superbook/trunk/DotTel_SDK/English.lproj/DotTel.strings

@@ -79 +79 @@
 "sa" = "Service Area";    //    e.g. "Hertfordshire, Essex, Cambridgeshire"
 "aux" = "Auxiliary Data";
+
+/* Other */
+"LIH Position" = "1";   // Set to 1 for 'Work Phone', to 2 for 'Phone Work'

apps/iphone/superbook/trunk/DotTel_SDK/French.lproj/DotTel.strings

@@ -79 +79 @@
 "sa" = "Service";    //    e.g. "Hertfordshire, Essex, Cambridgeshire"
 "aux" = "Données auxiliaires";
+
+
+/* Other */
+"LIH Position" = "2";   // Set to 1 for 'Work Phone', to 2 for 'Phone Work'

apps/iphone/superbook/trunk/DotTel_SDK/Russian.lproj/DotTel.strings

@@ -79 +79 @@
 "sa" = "ЗПМа ПбслужОваМОя";    //    e.g. "Hertfordshire, Essex, Cambridgeshire"
 "aux" = "ДПпПлМОтельМая ОМфПрЌацОя";
+
+
+/* Other */
+"LIH Position" = "2";   // Set to 1 for 'Work Phone', to 2 for 'Phone Work'