adium 4367:b80e3c890d1f: Made non-localizable elements in ESStat...
commits at adium.im
commits at adium.im
Mon Dec 12 20:10:40 UTC 2011
details: http://hg.adium.im/adium/rev/b80e3c890d1f
revision: 4367:b80e3c890d1f
branch: (none)
author: Patrick Steinhardt <steinhardt.p at me.com>
date: Mon Dec 12 21:10:03 2011 +0100
Made non-localizable elements in ESStatusAdvancedPreferences localizable. Fixes #15682.
diffs (139 lines):
diff -r 7de9987aeb0d -r b80e3c890d1f Resources/StatusPreferencesAdvanced.nib/designable.nib
--- a/Resources/StatusPreferencesAdvanced.nib/designable.nib Mon Dec 12 20:13:26 2011 +0100
+++ b/Resources/StatusPreferencesAdvanced.nib/designable.nib Mon Dec 12 21:10:03 2011 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
- <int key="IBDocument.SystemTarget">1050</int>
+ <int key="IBDocument.SystemTarget">1060</int>
<string key="IBDocument.SystemVersion">11C74</string>
<string key="IBDocument.InterfaceBuilderVersion">1938</string>
<string key="IBDocument.AppKitVersion">1138.23</string>
@@ -324,7 +324,6 @@
<string key="NSFrame">{{92, 14}, {100, 17}}</string>
<reference key="NSSuperview" ref="898224987"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTokenFieldCell" key="NSCell" id="514257890">
<int key="NSCellFlags">69336641</int>
@@ -1022,6 +1021,14 @@
<int key="connectionID">458</int>
</object>
<object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">label_itunesStatusFormat</string>
+ <reference key="source" ref="87627225"/>
+ <reference key="destination" ref="69975343"/>
+ </object>
+ <int key="connectionID">459</int>
+ </object>
+ <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: adium.preferenceController.Status Preferences.Status Window Always On Top</string>
<reference key="source" ref="407981218"/>
@@ -1468,7 +1475,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">458</int>
+ <int key="maxID">459</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1597,6 +1604,7 @@
<string key="label_composer">AILocalizationTextField</string>
<string key="label_genre">AILocalizationTextField</string>
<string key="label_instructions">AILocalizationTextField</string>
+ <string key="label_itunesStatusFormat">NSTextField</string>
<string key="label_status">AILocalizationTextField</string>
<string key="label_statusWindow">NSTextField</string>
<string key="label_title">AILocalizationTextField</string>
@@ -1643,6 +1651,10 @@
<string key="name">label_instructions</string>
<string key="candidateClassName">AILocalizationTextField</string>
</object>
+ <object class="IBToOneOutletInfo" key="label_itunesStatusFormat">
+ <string key="name">label_itunesStatusFormat</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
<object class="IBToOneOutletInfo" key="label_status">
<string key="name">label_status</string>
<string key="candidateClassName">AILocalizationTextField</string>
@@ -1703,12 +1715,16 @@
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
- <integer value="1050" key="NS.object.0"/>
+ <real value="1060" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+ <real value="3200" key="NS.object.0"/>
+ </object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
diff -r 7de9987aeb0d -r b80e3c890d1f Resources/StatusPreferencesAdvanced.nib/keyedobjects.nib
Binary file Resources/StatusPreferencesAdvanced.nib/keyedobjects.nib has changed
diff -r 7de9987aeb0d -r b80e3c890d1f Resources/en.lproj/Localizable.strings
Binary file Resources/en.lproj/Localizable.strings has changed
diff -r 7de9987aeb0d -r b80e3c890d1f Source/ESStatusAdvancedPreferences.h
--- a/Source/ESStatusAdvancedPreferences.h Mon Dec 12 20:13:26 2011 +0100
+++ b/Source/ESStatusAdvancedPreferences.h Mon Dec 12 21:10:03 2011 +0100
@@ -25,6 +25,7 @@
IBOutlet NSBox *box_itunesElements;
+ IBOutlet NSTextField *label_itunesStatusFormat;
IBOutlet AILocalizationTextField *label_instructions;
IBOutlet AILocalizationTextField *label_album;
IBOutlet AILocalizationTextField *label_artist;
diff -r 7de9987aeb0d -r b80e3c890d1f Source/ESStatusAdvancedPreferences.m
--- a/Source/ESStatusAdvancedPreferences.m Mon Dec 12 20:13:26 2011 +0100
+++ b/Source/ESStatusAdvancedPreferences.m Mon Dec 12 21:10:03 2011 +0100
@@ -50,9 +50,10 @@
[label_statusWindow setLocalizedString:AILocalizedString(@"Away Status Window", nil)];
[checkBox_statusWindowHideInBackground setLocalizedString:AILocalizedString(@"Hide the status window when Adium is not active", nil)];
[checkBox_statusWindowAlwaysOnTop setLocalizedString:AILocalizedString(@"Show the status window above other windows", nil)];
-
+
+ [label_itunesStatusFormat setLocalizedString:AILocalizedString(@"iTunes Status Format", nil)];
[box_itunesElements setTitle:AILocalizedString(@"iTunes Elements", nil)];
-
+
[label_instructions setLocalizedString:AILocalizedString(@"Type text and drag iTunes elements to create a custom format.", nil)];
[label_album setLocalizedString:AILocalizedString(@"Album", nil)];
[label_artist setLocalizedString:AILocalizedString(@"Artist", nil)];
@@ -129,19 +130,19 @@
- (NSString *)tokenField:(NSTokenField *)tokenField displayStringForRepresentedObject:(id)representedObject
{
if ([representedObject isEqualToString:ALBUM_TRIGGER]) {
- return @"Let It Be";
+ return AILocalizedString(@"Let It Be", @"Example for album title");
} else if ([representedObject isEqualToString:ARTIST_TRIGGER]) {
- return @"The Beatles";
+ return AILocalizedString(@"The Beatles", @"Example for song artist");
} else if ([representedObject isEqualToString:COMPOSER_TRIGGER]) {
- return @"Harrison";
+ return AILocalizedString(@"Harrison", @"Example for song composer");
} else if ([representedObject isEqualToString:GENRE_TRIGGER]) {
- return @"Rock";
+ return AILocalizedString(@"Rock", @"Example for song genre");
} else if ([representedObject isEqualToString:STATUS_TRIGGER]) {
- return AILocalizedString(@"Paused", nil);
+ return AILocalizedString(@"Paused", @"Example for music players' status (e.g. playing, paused)");
} else if ([representedObject isEqualToString:TRACK_TRIGGER]) {
- return @"I Me Mine";
+ return AILocalizedString(@"I Me Mine", @"Example for song title");
} else if ([representedObject isEqualToString:YEAR_TRIGGER]) {
- return @"1970";
+ return AILocalizedString(@"1970", @"Example for a songs debut-year");
} else {
return nil;
}
More information about the commits
mailing list