Some more renames.

[enjoyable.git] / Classes / NJMappingMenuController.m

diff --git a/Classes/NJMappingMenuController.m b/Classes/NJMappingMenuController.m
index 0fa6183..6d9250f 100644 (file)
--- a/Classes/NJMappingMenuController.m
+++ b/Classes/NJMappingMenuController.m
@@ -27,12 +27,12 @@
                        name:NJEventMappingChanged
                      object:nil];
         [center addObserver:self
-                   selector:@selector(eventTranslationActivated:)
-                       name:NJEventTranslationActivated
+                   selector:@selector(eventSimulationStarted:)
+                       name:NJEventSimulationStarted
                      object:nil];
         [center addObserver:self
-                   selector:@selector(eventTranslationDeactivated:)
-                       name:NJEventTranslationDeactivated
+                   selector:@selector(eventSimulationStopped:)
+                       name:NJEventSimulationStopped
                      object:nil];
     }
     return self;
@@ -52,8 +52,8 @@
 }
 
 - (void)mappingsListDidChange:(NSNotification *)note {
-    NSArray *mappings = note.userInfo[@"mappings"];
-    NJMapping *currentMapping = note.userInfo[@"mapping"];
+    NSArray *mappings = note.userInfo[NJMappingListKey];
+    NJMapping *currentMapping = note.userInfo[NJMappingKey];
     NSMenuItem *toRemove;
     while (self.menu.numberOfItems > self.firstMappingIndex
            && (toRemove = [self.menu itemAtIndex:self.firstMappingIndex])
@@ -76,7 +76,8 @@
         [self.menu insertItem:item atIndex:index++];
         if (added == MAXIMUM_MAPPINGS_IN_MENU
             && mappings.count > MAXIMUM_MAPPINGS_IN_MENU + 1) {
-            NSString *msg = [NSString stringWithFormat:@"(and %lu more…)",
+            NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"mapping overflow %lu",
+                                                                         @"menu item when mappings list overflows"),
                              mappings.count - MAXIMUM_MAPPINGS_IN_MENU];
             NSMenuItem *end = [[NSMenuItem alloc] initWithTitle:msg
                                                          action:@selector(_mappingListWasChosen:)
@@ -92,20 +93,20 @@
 }
 
 - (void)mappingDidChange:(NSNotification *)note {
-    NJMapping *mapping = note.userInfo[@"mapping"];
+    NJMapping *mapping = note.userInfo[NJMappingKey];
     for (NSMenuItem *item in self.menu.itemArray)
         if ([item.representedObject isKindOfClass:NJMapping.class])
             item.state = mapping == item.representedObject;
 }
 
-- (void)eventTranslationActivated:(NSNotification *)note {
-    self.eventTranslationToggle.title = @"Disable";
+- (void)eventSimulationStarted:(NSNotification *)note {
+    self.eventSimulationToggle.title = NSLocalizedString(@"Disable",
+                                                          @"menu item text to disable event simulation");
 }
 
-- (void)eventTranslationDeactivated:(NSNotification *)note {
-    self.eventTranslationToggle.title = @"Enable";    
+- (void)eventSimulationStopped:(NSNotification *)note {
+    self.eventSimulationToggle.title = NSLocalizedString(@"Enable",
+                                                          @"menu item text to enable event simulation");
 }
 
-
-
 @end