MacGUI: Remove last traces of "_" macro and TranslateString. Patch by blindjimmy.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1443 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.h b/macosx/Controller.h
index c1b3ce61ee73ab7c8bcd522e36191a7cb95e1af3..a1394d79921787a66499ddd2c93b9c0777c1107e 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -252,8 +252,6 @@ BOOL                        fIsDragging;
 - (void) performScan:(NSString *) scanPath scanTitleNum: (int) scanTitleNum;
 - (IBAction) showNewScan: (id) sender;
 
-- (void)     TranslateStrings;
-
 - (void)     updateUI: (NSTimer *) timer;
 - (void)     enableUI: (bool) enable;
 

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 9c1f31192837ae4b5e4bea50791ce3f6de61293b..85417e3a92829eb3ca02b99c0053cefac7ef6544 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -16,7 +16,6 @@
 #include "dvdread/dvd_reader.h"
 #include "HBPresets.h"
 
-#define _(a) NSLocalizedString(a,NULL)
 #define DragDropSimplePboardType       @"MyCustomOutlineViewPboardType"
 
 /* We setup the toolbar values here */
@@ -234,7 +233,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
        
     /* Video framerate */
     [fVidRatePopUp removeAllItems];
-       [fVidRatePopUp addItemWithTitle: _( @"Same as source" )];
+       [fVidRatePopUp addItemWithTitle: NSLocalizedString( @"Same as source", @"" )];
     for( int i = 0; i < hb_video_rates_count; i++ )
     {
         if ([[NSString stringWithCString: hb_video_rates[i].string] isEqualToString: [NSString stringWithFormat: @"%.3f",23.976]])
@@ -302,23 +301,6 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
     
 }
 
-- (void) TranslateStrings
-{
-    [fSrcTitleField     setStringValue: _( @"Title:" )];
-    [fSrcChapterField   setStringValue: _( @"Chapters:" )];
-    [fSrcChapterToField setStringValue: _( @"to" )];
-    [fSrcDuration1Field setStringValue: _( @"Duration:" )];
-
-    [fDstFormatField    setStringValue: _( @"Format:" )];
-    [fDstFile1Field     setStringValue: _( @"File:" )];
-    [fDstBrowseButton   setTitle:       _( @"Browse" )];
-
-    [fVidRateField      setStringValue: _( @"Framerate (fps):" )];
-    [fVidEncoderField   setStringValue: _( @"Encoder:" )];
-    [fVidQualityField   setStringValue: _( @"Quality:" )];
-}
-
-
 - (void) enableUI: (bool) b
 {
     NSControl * controls[] =
@@ -497,7 +479,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         case HB_STATE_SCANNING:
                {
             [fSrcDVD2Field setStringValue: [NSString stringWithFormat:
-                                            _( @"Scanning title %d of %d..." ),
+                                            NSLocalizedString( @"Scanning title %d of %d...", @"" ),
                                             p.title_cur, p.title_count]];
             [fScanIndicator setHidden: NO];
             [fScanIndicator setDoubleValue: 100.0 * ( p.title_cur - 1 ) / p.title_count];
@@ -526,12 +508,12 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
                                jobs during encoding, if they cannot be fixed in libhb, will implement a
                                nasty but working cocoa solution */
                        /* Update text field */
-                       string = [NSMutableString stringWithFormat: _( @"Encoding: task %d of %d, %.2f %%" ), p.job_cur, p.job_count, 100.0 * p.progress];
+                       string = [NSMutableString stringWithFormat: NSLocalizedString( @"Encoding: task %d of %d, %.2f %%", @"" ), p.job_cur, p.job_count, 100.0 * p.progress];
             
                        if( p.seconds > -1 )
             {
                 [string appendFormat:
-                    _( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)" ),
+                    NSLocalizedString( @" (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)", @"" ),
                     p.rate_cur, p.rate_avg, p.hours, p.minutes, p.seconds];
             }
             [fStatusField setStringValue: string];
@@ -577,7 +559,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
                        
             /* Update text field */
             string = [NSMutableString stringWithFormat:
-                _( @"Muxing..." )];
+                NSLocalizedString( @"Muxing...", @"" )];
             [fStatusField setStringValue: string];
                        
             /* Update slider */
@@ -595,7 +577,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
 #undef p
                        
         case HB_STATE_PAUSED:
-                   [fStatusField setStringValue: _( @"Paused" )];
+                   [fStatusField setStringValue: NSLocalizedString( @"Paused", @"" )];
             
                        // Pass along the info to HBQueueController
             [fQueueController libhbStateChanged: s];
@@ -613,7 +595,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
             while( ( job = hb_job( fHandle, 0 ) ) && ( !IsFirstPass(job->sequence_id) ) )
                 hb_rem( fHandle, job );
 
-            [fStatusField setStringValue: _( @"Done." )];
+            [fStatusField setStringValue: NSLocalizedString( @"Done.", @"" )];
             [fRipIndicator setIndeterminate: NO];
             [fRipIndicator setDoubleValue: 0.0];
             [toolbar validateVisibleItems];
@@ -693,9 +675,9 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
     /* Lets show the queue status here in the main window */
        int queue_count = [fQueueController pendingCount];
        if( queue_count == 1)
-               [fQueueStatus setStringValue: _( @"1 encode queued") ];
+               [fQueueStatus setStringValue: NSLocalizedString( @"1 encode queued", @"" ) ];
     else if (queue_count > 1)
-               [fQueueStatus setStringValue: [NSString stringWithFormat: _( @"%d encodes queued" ), queue_count]];
+               [fQueueStatus setStringValue: [NSString stringWithFormat: NSLocalizedString( @"%d encodes queued", @"" ), queue_count]];
        else
                [fQueueStatus setStringValue: @""];
 }
@@ -1745,11 +1727,11 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
        if( [[NSFileManager defaultManager] fileExistsAtPath:
             [fDstFile2Field stringValue]] )
     {
-        NSBeginCriticalAlertSheet( _( @"File already exists" ),
-            _( @"Cancel" ), _( @"Overwrite" ), NULL, fWindow, self,
+        NSBeginCriticalAlertSheet( NSLocalizedString( @"File already exists", @"" ),
+            NSLocalizedString( @"Cancel", @"" ), NSLocalizedString( @"Overwrite", @"" ), NULL, fWindow, self,
             @selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ),
             NULL, NULL, [NSString stringWithFormat:
-            _( @"Do you want to overwrite %@?" ),
+            NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
             [fDstFile2Field stringValue]] );
         // overwriteAddToQueueAlertDone: will be called when the alert is dismissed.
     }
@@ -1758,11 +1740,11 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
     else if ( ([fQueueController pendingJobGroupWithDestinationPath:[fDstFile2Field stringValue]] != nil)
             || ([[[fQueueController currentJobGroup] destinationPath] isEqualToString: [fDstFile2Field stringValue]]) )
     {
-        NSBeginCriticalAlertSheet( _( @"Another queued encode has specified the same destination." ),
-            _( @"Cancel" ), _( @"Overwrite" ), NULL, fWindow, self,
+        NSBeginCriticalAlertSheet( NSLocalizedString( @"Another queued encode has specified the same destination.", @"" ),
+            NSLocalizedString( @"Cancel", @"" ), NSLocalizedString( @"Overwrite", @"" ), NULL, fWindow, self,
             @selector( overwriteAddToQueueAlertDone:returnCode:contextInfo: ),
             NULL, NULL, [NSString stringWithFormat:
-            _( @"Do you want to overwrite %@?" ),
+            NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
             [fDstFile2Field stringValue]] );
         // overwriteAddToQueueAlertDone: will be called when the alert is dismissed.
     }
@@ -1932,11 +1914,11 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
     /* We check for duplicate name here */
     if( [[NSFileManager defaultManager] fileExistsAtPath:[fDstFile2Field stringValue]] )
     {
-        NSBeginCriticalAlertSheet( _( @"File already exists" ),
-            _( @"Cancel" ), _( @"Overwrite" ), NULL, fWindow, self,
+        NSBeginCriticalAlertSheet( NSLocalizedString( @"File already exists", @"" ),
+            NSLocalizedString( @"Cancel", "" ), NSLocalizedString( @"Overwrite", @"" ), NULL, fWindow, self,
             @selector( overWriteAlertDone:returnCode:contextInfo: ),
             NULL, NULL, [NSString stringWithFormat:
-            _( @"Do you want to overwrite %@?" ),
+            NSLocalizedString( @"Do you want to overwrite %@?", @"" ),
             [fDstFile2Field stringValue]] );
             
         // overWriteAlertDone: will be called when the alert is dismissed. It will call doRip.
@@ -2591,7 +2573,7 @@ the user is using "Custom" settings by determining the sender*/
 - (IBAction) qualitySliderChanged: (id) sender
 {
     [fVidConstantCell setTitle: [NSString stringWithFormat:
-        _( @"Constant quality: %.0f %%" ), 100.0 *
+        NSLocalizedString( @"Constant quality: %.0f %%", @"" ), 100.0 *
         [fVidQualitySlider floatValue]]];
                [self customSettingUsed: sender];
 }
@@ -2972,7 +2954,7 @@ the user is using "Custom" settings by determining the sender*/
        hb_audio_config_t * audio;
 
     [sender removeAllItems];
-    [sender addItemWithTitle: _( @"None" )];
+    [sender addItemWithTitle: NSLocalizedString( @"None", @"" )];
     for( int i = 0; i < hb_list_count( title->list_audio ); i++ )
     {
         audio = (hb_audio_config_t *) hb_list_audio_config_item( title->list_audio, i );

diff --git a/macosx/genstrings.sh b/macosx/genstrings.sh
index 3c32157777af1af8bbb543489e562557bbbda3d3..0745d2eeb130e0f34d18be34b262c873cdd08f47 100755 (executable)
--- a/macosx/genstrings.sh
+++ b/macosx/genstrings.sh
@@ -1,7 +1,2 @@
 #! /bin/sh
-rm -f genstrings.tmp
-cat *.mm | grep -v "^#define.*_(" | \
-    sed 's/_( \(@"[^"]*"\) )/NSLocalizedString( \1, nil )/g' > \
-    genstrings.tmp
-genstrings genstrings.tmp
-rm -f genstrings.tmp
+genstrings *.m*