From 27696e74d5de3a3ecaa31d953e572f9efb956a7d Mon Sep 17 00:00:00 2001
From: Eric Quesada <equesada@Erics-MacBook-Pro.local>
Date: Sun, 11 Jan 2015 11:23:15 +0100
Subject: [PATCH 1/4] Added the ability to set a Default Language from the
 Localization Editor

---
 .../ccBuilder/LocalizationEditorHandler.h     |   1 +
 .../ccBuilder/LocalizationEditorHandler.m     |  29 +-
 .../ccBuilder/LocalizationEditorLanguage.h    |   1 +
 .../ccBuilder/LocalizationEditorLanguage.m    |   2 +
 .../ccBuilder/LocalizationEditorWindow.h      |   2 +
 .../ccBuilder/LocalizationEditorWindow.m      |  39 ++
 .../ccBuilder/LocalizationEditorWindow.xib    | 489 ++++++++++++++++--
 7 files changed, 523 insertions(+), 40 deletions(-)

diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorHandler.h b/SpriteBuilder/ccBuilder/LocalizationEditorHandler.h
index 638269434..07aa6f3b0 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorHandler.h
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorHandler.h
@@ -37,6 +37,7 @@
 - (LocalizationEditorLanguage*) getLanguageByIsoLangCode:(NSString*)code;
 - (void) addActiveLanguage:(LocalizationEditorLanguage*) lang;
 - (void) removeActiveLangage:(LocalizationEditorLanguage*) lang;
+- (void) setDefaultLanguage:(LocalizationEditorLanguage*) lang;
 - (void) setEdited;
 
 - (NSString*) translationForKey:(NSString*)key;
diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorHandler.m b/SpriteBuilder/ccBuilder/LocalizationEditorHandler.m
index ad4df92c3..cd3dfe2d9 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorHandler.m
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorHandler.m
@@ -64,12 +64,19 @@ - (void) store
     [ser setObject:[NSNumber numberWithInt:kCCBTranslationFileFormatVersion] forKey:@"fileVersion"];
     
     // Languages
+    NSString* defaultLanguage = nil;
     NSMutableArray* serLangs = [NSMutableArray array];
     for (LocalizationEditorLanguage* lang in activeLanguages)
     {
         [serLangs addObject:lang.isoLangCode];
+        if (lang.defaultLanguage) {
+            defaultLanguage = lang.isoLangCode;
+        }
     }
     [ser setObject:serLangs forKey:@"activeLanguages"];
+    if (defaultLanguage) {
+        [ser setObject:defaultLanguage forKey:@"defaultLanguage"];
+    }
     
     // Translations
     NSMutableArray* serTransls = [NSMutableArray array];
@@ -101,12 +108,20 @@ - (BOOL) load
     // Read data
     
     // Languages
+    NSString* defaultLang = [ser objectForKey:@"defaultLanguage"];
     NSArray* serLangs = [ser objectForKey:@"activeLanguages"];
     for (NSString* isoCode in serLangs)
     {
         // Find language for code and add active language
         LocalizationEditorLanguage* lang = [self getLanguageByIsoLangCode:isoCode];
-        if (lang) [activeLanguages addObject:lang];
+        if (lang)
+        {
+            if ([lang.isoLangCode isEqualToString:defaultLang])
+            {
+                lang.defaultLanguage = YES;
+            }
+            [activeLanguages addObject:lang];
+        }
     }
     
     // Translations
@@ -280,6 +295,18 @@ - (void) removeActiveLangage:(LocalizationEditorLanguage*) lang
     [self setCurrentLanguage:currentLanguage];
 }
 
+- (void) setDefaultLanguage:(LocalizationEditorLanguage*) lang
+{
+    for (LocalizationEditorLanguage* oneLanguage in activeLanguages)
+    {
+        oneLanguage.defaultLanguage = NO;
+        if (lang && [oneLanguage.isoLangCode isEqualToString:lang.isoLangCode])
+        {
+            oneLanguage.defaultLanguage = YES;
+        }
+    }
+}
+
 - (IBAction)openEditor:(id)sender
 {
     if (!windowController)
diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorLanguage.h b/SpriteBuilder/ccBuilder/LocalizationEditorLanguage.h
index aa3052501..2403bc925 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorLanguage.h
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorLanguage.h
@@ -13,6 +13,7 @@
 @property (nonatomic,copy) NSString* isoLangCode;
 @property (nonatomic,copy) NSString* name;
 @property (nonatomic,readwrite) BOOL quickEdit;
+@property (nonatomic,readwrite) BOOL defaultLanguage;
 
 - (id) initWithIsoLangCode:(NSString*)code;
 
diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorLanguage.m b/SpriteBuilder/ccBuilder/LocalizationEditorLanguage.m
index 18e46666b..a07178574 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorLanguage.m
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorLanguage.m
@@ -39,6 +39,8 @@ - (id) initWithIsoLangCode:(NSString*)code
     
     self.quickEdit = YES;
     
+    self.defaultLanguage = NO;
+    
     return self;
 }
 
diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.h b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.h
index 8c4a7c6d2..f583a32df 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.h
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.h
@@ -13,6 +13,7 @@
     IBOutlet NSTableView* tableTranslations;
     IBOutlet NSTableView* tableLanguages;
     IBOutlet NSPopUpButton* popLanguageAdd;
+    IBOutlet NSPopUpButton* popLanguageSetDefault;
     IBOutlet NSPopUpButton* popCurrentLanguage;
     IBOutlet NSTextView* textInspectorKey;
 }
@@ -29,6 +30,7 @@
 - (IBAction)pressedAddGroup:(id)sender;
 
 - (IBAction)selectedAddLanguage:(id)sender;
+- (IBAction)selectedSetDefaultLanguage:(id)sender;
 - (void)removeLanguagesAtIndexes:(NSIndexSet*)idxs;
 - (IBAction)selectedCurrentLanguage:(id)sender;
 
diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
index 47900b9e3..a123d7b77 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
@@ -22,6 +22,7 @@ - (void) awakeFromNib
 {
     [tableTranslations registerForDraggedTypes:[NSArray arrayWithObject:@"com.cocosbuilder.LocalizationEditorTranslation"]];
     [self populateLanguageAddMenu];
+    [self populateLanguageSetDefaultMenu];
     [tableLanguages reloadData];
     [self updateLanguageSelectionMenu];
     [self addLanguageColumns];
@@ -40,6 +41,28 @@ - (void) populateLanguageAddMenu
     [popLanguageAdd addItemsWithTitles:langTitles];
 }
 
+- (void) populateLanguageSetDefaultMenu
+{
+    [popLanguageSetDefault removeAllItems];
+    
+    NSArray* langs = [AppDelegate appDelegate].localizationEditorHandler.activeLanguages;
+    
+    NSString* firstItem = @"Set Default Language";
+    
+    NSMutableArray* langTitles = [NSMutableArray array];
+    for (LocalizationEditorLanguage* lang in langs)
+    {
+        [langTitles addObject:lang.name];
+        if (lang.defaultLanguage)
+        {
+            firstItem = [NSString stringWithFormat:@"Default: %@", lang.name];
+        }
+    }
+    [langTitles addObject:@"None"];
+    [langTitles insertObject:firstItem atIndex:0];
+    [popLanguageSetDefault addItemsWithTitles:langTitles];
+}
+
 - (void) updateLanguageSelectionMenu
 {
     NSArray* langs = [AppDelegate appDelegate].localizationEditorHandler.activeLanguages;
@@ -208,10 +231,25 @@ - (IBAction)selectedAddLanguage:(id)sender
     [self updateLanguageSelectionMenu];
     [self updateQuickEditLangs];
     [self updateInspector];
+    [self populateLanguageSetDefaultMenu];
     
     [handler setEdited];
 }
 
+- (IBAction)selectedSetDefaultLanguage:(id)sender
+{
+    NSString* name = popLanguageSetDefault.selectedItem.title;
+    LocalizationEditorHandler* handler = [AppDelegate appDelegate].localizationEditorHandler;
+    LocalizationEditorLanguage* lang = nil;
+    if (![@"None" isEqualToString:name])
+    {
+        lang = [handler getLanguageByName:name];
+    }
+    [handler setDefaultLanguage:lang];
+    [self populateLanguageSetDefaultMenu];
+    [handler setEdited];
+}
+
 - (void)removeLanguagesAtIndexes:(NSIndexSet*)idxs
 {
     LocalizationEditorHandler* handler = [AppDelegate appDelegate].localizationEditorHandler;
@@ -227,6 +265,7 @@ - (void)removeLanguagesAtIndexes:(NSIndexSet*)idxs
     [self updateLanguageSelectionMenu];
     [self updateQuickEditLangs];
     [self updateInspector];
+    [self populateLanguageSetDefaultMenu];
     
     [handler setEdited];
 }
diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.xib b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.xib
index 069bae88d..28df60a62 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.xib
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.xib
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
-		<int key="IBDocument.SystemTarget">1080</int>
-		<string key="IBDocument.SystemVersion">12E55</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.39</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<int key="IBDocument.SystemTarget">1090</int>
+		<string key="IBDocument.SystemVersion">14B25</string>
+		<string key="IBDocument.InterfaceBuilderVersion">6254</string>
+		<string key="IBDocument.AppKitVersion">1343.16</string>
+		<string key="IBDocument.HIToolboxVersion">755.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
+			<string key="NS.object.0">6254</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSBox</string>
@@ -71,7 +71,7 @@
 							<array class="NSMutableArray" key="NSSubviews">
 								<object class="NSClipView" id="506547297">
 									<reference key="NSNextResponder" ref="904511206"/>
-									<int key="NSvFlags">2304</int>
+									<int key="NSvFlags">2322</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<object class="NSTableView" id="977663147">
 											<reference key="NSNextResponder" ref="506547297"/>
@@ -79,7 +79,7 @@
 											<string key="NSFrameSize">{565, 531}</string>
 											<reference key="NSSuperview" ref="506547297"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="326874921"/>
+											<reference key="NSNextKeyView" ref="697767704"/>
 											<string key="NSReuseIdentifierKey">_NS:13</string>
 											<bool key="NSEnabled">YES</bool>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -274,7 +274,7 @@
 								</object>
 								<object class="NSClipView" id="697767704">
 									<reference key="NSNextResponder" ref="904511206"/>
-									<int key="NSvFlags">2304</int>
+									<int key="NSvFlags">2338</int>
 									<array class="NSMutableArray" key="NSSubviews">
 										<reference ref="92423709"/>
 									</array>
@@ -284,14 +284,12 @@
 									<reference key="NSNextKeyView" ref="92423709"/>
 									<string key="NSReuseIdentifierKey">_NS:15</string>
 									<reference key="NSDocView" ref="92423709"/>
-									<reference key="NSBGColor" ref="224334049"/>
-									<int key="NScvFlags">4</int>
 								</object>
 							</array>
 							<string key="NSFrame">{{0, 21}, {565, 548}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView" ref="697767704"/>
+							<reference key="NSNextKeyView" ref="506547297"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<int key="NSsFlags">133680</int>
 							<reference key="NSVScroller" ref="326874921"/>
@@ -444,7 +442,7 @@
 											<array class="NSMutableArray" key="NSSubviews">
 												<object class="NSClipView" id="810274201">
 													<reference key="NSNextResponder" ref="436068953"/>
-													<int key="NSvFlags">2304</int>
+													<int key="NSvFlags">2322</int>
 													<array class="NSMutableArray" key="NSSubviews">
 														<object class="NSTextView" id="179240933">
 															<reference key="NSNextResponder" ref="810274201"/>
@@ -471,7 +469,7 @@
 															<string key="NSFrameSize">{280, 54}</string>
 															<reference key="NSSuperview" ref="810274201"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="994153462"/>
+															<reference key="NSNextKeyView" ref="83160257"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<object class="NSTextContainer" key="NSTextContainer" id="434918094">
 																<object class="NSLayoutManager" key="NSLayoutManager">
@@ -510,7 +508,7 @@
 																		<reference key="NSColor" ref="357428451"/>
 																	</object>
 																</dictionary>
-																<reference key="NSInsertionColor" ref="357428451"/>
+																<reference key="NSInsertionColor" ref="38120324"/>
 																<dictionary key="NSLinkAttributes">
 																	<object class="NSColor" key="NSColor" id="100689885">
 																		<int key="NSColorSpace">1</int>
@@ -592,7 +590,7 @@
 											<string key="NSFrame">{{7, 8}, {282, 56}}</string>
 											<reference key="NSSuperview" ref="250376625"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="83160257"/>
+											<reference key="NSNextKeyView" ref="810274201"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133138</int>
 											<reference key="NSVScroller" ref="994153462"/>
@@ -614,7 +612,7 @@
 											<object class="NSTextFieldCell" key="NSCell" id="711591732">
 												<int key="NSCellFlags">68157504</int>
 												<int key="NSCellFlags2">272761856</int>
-												<string key="NSContents">Key (default value)</string>
+												<string key="NSContents">Key</string>
 												<reference key="NSSupport" ref="26"/>
 												<string key="NSCellIdentifier">_NS:1535</string>
 												<reference key="NSControlView" ref="33324400"/>
@@ -629,7 +627,7 @@
 											<array class="NSMutableArray" key="NSSubviews">
 												<object class="NSClipView" id="1004241364">
 													<reference key="NSNextResponder" ref="180853500"/>
-													<int key="NSvFlags">2304</int>
+													<int key="NSvFlags">2322</int>
 													<array class="NSMutableArray" key="NSSubviews">
 														<object class="NSTextView" id="1042358690">
 															<reference key="NSNextResponder" ref="1004241364"/>
@@ -656,7 +654,7 @@
 															<string key="NSFrameSize">{280, 240}</string>
 															<reference key="NSSuperview" ref="1004241364"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="688085468"/>
+															<reference key="NSNextKeyView" ref="351065510"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<object class="NSTextContainer" key="NSTextContainer" id="257657450">
 																<object class="NSLayoutManager" key="NSLayoutManager">
@@ -685,7 +683,7 @@
 																	<reference key="NSBackgroundColor" ref="574934302"/>
 																	<reference key="NSColor" ref="199203242"/>
 																</dictionary>
-																<reference key="NSInsertionColor" ref="357428451"/>
+																<reference key="NSInsertionColor" ref="38120324"/>
 																<dictionary key="NSLinkAttributes">
 																	<reference key="NSColor" ref="100689885"/>
 																	<reference key="NSCursor" ref="667357011"/>
@@ -758,7 +756,7 @@
 											<string key="NSFrame">{{7, 91}, {282, 242}}</string>
 											<reference key="NSSuperview" ref="250376625"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="351065510"/>
+											<reference key="NSNextKeyView" ref="1004241364"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133138</int>
 											<reference key="NSVScroller" ref="688085468"/>
@@ -774,7 +772,7 @@
 											<array class="NSMutableArray" key="NSSubviews">
 												<object class="NSClipView" id="848209511">
 													<reference key="NSNextResponder" ref="604712012"/>
-													<int key="NSvFlags">2304</int>
+													<int key="NSvFlags">2322</int>
 													<array class="NSMutableArray" key="NSSubviews">
 														<object class="NSTextView" id="509458816">
 															<reference key="NSNextResponder" ref="848209511"/>
@@ -801,7 +799,7 @@
 															<string key="NSFrameSize">{280, 54}</string>
 															<reference key="NSSuperview" ref="848209511"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView" ref="1017322993"/>
+															<reference key="NSNextKeyView" ref="250457565"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<object class="NSTextContainer" key="NSTextContainer" id="290816708">
 																<object class="NSLayoutManager" key="NSLayoutManager">
@@ -830,7 +828,7 @@
 																	<reference key="NSBackgroundColor" ref="574934302"/>
 																	<reference key="NSColor" ref="199203242"/>
 																</dictionary>
-																<reference key="NSInsertionColor" ref="357428451"/>
+																<reference key="NSInsertionColor" ref="38120324"/>
 																<dictionary key="NSLinkAttributes">
 																	<reference key="NSColor" ref="100689885"/>
 																	<reference key="NSCursor" ref="667357011"/>
@@ -903,7 +901,7 @@
 											<string key="NSFrame">{{7, 365}, {282, 56}}</string>
 											<reference key="NSSuperview" ref="250376625"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="250457565"/>
+											<reference key="NSNextKeyView" ref="848209511"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133138</int>
 											<reference key="NSVScroller" ref="1017322993"/>
@@ -931,7 +929,7 @@
 											<array class="NSMutableArray" key="NSSubviews">
 												<object class="NSClipView" id="545951812">
 													<reference key="NSNextResponder" ref="351942441"/>
-													<int key="NSvFlags">2304</int>
+													<int key="NSvFlags">2322</int>
 													<array class="NSMutableArray" key="NSSubviews">
 														<object class="NSTableView" id="164666846">
 															<reference key="NSNextResponder" ref="545951812"/>
@@ -1135,9 +1133,11 @@
 									<string key="NSColorName">textBackgroundColor</string>
 									<reference key="NSColor" ref="247284560"/>
 								</object>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+								<object class="NSColor" key="NSTextColor" id="553328200">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">labelColor</string>
+									<reference key="NSColor" ref="357428451"/>
 								</object>
 							</object>
 							<int key="NSBorderType">3</int>
@@ -1189,10 +1189,7 @@
 								<string key="NSContents">Box</string>
 								<reference key="NSSupport" ref="83374456"/>
 								<reference key="NSBackgroundColor" ref="778750433"/>
-								<object class="NSColor" key="NSTextColor">
-									<int key="NSColorSpace">3</int>
-									<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
-								</object>
+								<reference key="NSTextColor" ref="553328200"/>
 							</object>
 							<int key="NSBorderType">3</int>
 							<int key="NSBoxType">2</int>
@@ -1205,7 +1202,6 @@
 							<string key="NSFrame">{{760, -1}, {104, 22}}</string>
 							<reference key="NSSuperview" ref="1006"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
 							<string key="NSReuseIdentifierKey">_NS:9</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSPopUpButtonCell" key="NSCell" id="620219114">
@@ -1249,6 +1245,55 @@
 							</object>
 							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 						</object>
+						<object class="NSPopUpButton" id="629498475">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{565, -1}, {151, 22}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<string key="NSReuseIdentifierKey">_NS:9</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="591827695">
+								<int key="NSCellFlags">-2080374720</int>
+								<int key="NSCellFlags2">134350848</int>
+								<reference key="NSSupport" ref="26"/>
+								<string key="NSCellIdentifier">_NS:9</string>
+								<reference key="NSControlView" ref="629498475"/>
+								<int key="NSButtonFlags">-2034614272</int>
+								<int key="NSButtonFlags2">134</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<object class="NSMenuItem" key="NSMenuItem" id="782388451">
+									<reference key="NSMenu" ref="772016102"/>
+									<bool key="NSIsHidden">YES</bool>
+									<string key="NSTitle">Set Default Language</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<int key="NSState">1</int>
+									<reference key="NSImage" ref="309718622"/>
+									<reference key="NSOnImage" ref="61126732"/>
+									<reference key="NSMixedImage" ref="36493996"/>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="591827695"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="772016102">
+									<string key="NSTitle">OtherViews</string>
+									<array class="NSMutableArray" key="NSMenuItems">
+										<reference ref="782388451"/>
+									</array>
+									<reference key="NSMenuFont" ref="83374456"/>
+								</object>
+								<bool key="NSPullDown">YES</bool>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
 					</array>
 					<string key="NSFrameSize">{863, 568}</string>
 					<reference key="NSSuperview"/>
@@ -1265,7 +1310,7 @@
 			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
+			<array key="connectionRecords">
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">pressedAdd:</string>
@@ -1362,6 +1407,22 @@
 					</object>
 					<int key="connectionID">133</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectedSetDefaultLanguage:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="629498475"/>
+					</object>
+					<int key="connectionID">156</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">popLanguageSetDefault</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="629498475"/>
+					</object>
+					<int key="connectionID">157</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">dataSource</string>
@@ -1654,6 +1715,22 @@
 					</object>
 					<int key="connectionID">143</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: hasOpenFile</string>
+						<reference key="source" ref="629498475"/>
+						<reference key="destination" ref="1001"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="629498475"/>
+							<reference key="NSDestination" ref="1001"/>
+							<string key="NSLabel">enabled: hasOpenFile</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">hasOpenFile</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">155</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -1699,6 +1776,7 @@
 							<reference ref="93037643"/>
 							<reference ref="132073020"/>
 							<reference ref="531466873"/>
+							<reference ref="629498475"/>
 						</array>
 						<reference key="parent" ref="1005"/>
 					</object>
@@ -2075,6 +2153,35 @@
 						<reference key="object" ref="534393523"/>
 						<reference key="parent" ref="0"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="629498475"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="591827695"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">151</int>
+						<reference key="object" ref="591827695"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="772016102"/>
+						</array>
+						<reference key="parent" ref="629498475"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">152</int>
+						<reference key="object" ref="772016102"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="782388451"/>
+						</array>
+						<reference key="parent" ref="591827695"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">153</int>
+						<reference key="object" ref="782388451"/>
+						<reference key="parent" ref="772016102"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2086,8 +2193,13 @@
 				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
 				<string key="10.CustomClassName">CCBTextFieldCell</string>
 				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="150.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="151.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="152.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<reference key="2.IBNSViewMetadataGestureRecognizers" ref="0"/>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2153,7 +2265,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">149</int>
+			<int key="maxID">157</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2205,6 +2317,7 @@
 						<string key="pressedAddGroup:">id</string>
 						<string key="selectedAddLanguage:">id</string>
 						<string key="selectedCurrentLanguage:">id</string>
+						<string key="selectedSetDefaultLanguage:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
 						<object class="IBActionInfo" key="pressedAdd:">
@@ -2223,10 +2336,15 @@
 							<string key="name">selectedCurrentLanguage:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="selectedSetDefaultLanguage:">
+							<string key="name">selectedSetDefaultLanguage:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="popCurrentLanguage">NSPopUpButton</string>
 						<string key="popLanguageAdd">NSPopUpButton</string>
+						<string key="popLanguageSetDefault">NSPopUpButton</string>
 						<string key="tableLanguages">NSTableView</string>
 						<string key="tableTranslations">NSTableView</string>
 						<string key="textInspectorKey">NSTextView</string>
@@ -2240,6 +2358,10 @@
 							<string key="name">popLanguageAdd</string>
 							<string key="candidateClassName">NSPopUpButton</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="popLanguageSetDefault">
+							<string key="name">popLanguageSetDefault</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="tableLanguages">
 							<string key="name">tableLanguages</string>
 							<string key="candidateClassName">NSTableView</string>
@@ -2258,6 +2380,295 @@
 						<string key="minorKey">./Classes/LocalizationEditorWindow.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">LocalizationEditorWindow</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="pressedAdd:">id</string>
+						<string key="pressedAddGroup:">id</string>
+						<string key="selectedAddLanguage:">id</string>
+						<string key="selectedCurrentLanguage:">id</string>
+						<string key="selectedSetDefaultLanguage:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="pressedAdd:">
+							<string key="name">pressedAdd:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="pressedAddGroup:">
+							<string key="name">pressedAddGroup:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="selectedAddLanguage:">
+							<string key="name">selectedAddLanguage:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="selectedCurrentLanguage:">
+							<string key="name">selectedCurrentLanguage:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="selectedSetDefaultLanguage:">
+							<string key="name">selectedSetDefaultLanguage:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/LocalizationEditorWindow.m</string>
+					</object>
+				</object>
+			</array>
+			<array class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+				<object class="IBPartialClassDescription">
+					<string key="className">NSActionCell</string>
+					<string key="superclassName">NSCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSBox</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSBox.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSButton</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSButtonCell</string>
+					<string key="superclassName">NSActionCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSCell</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSControl</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSFormatter</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">Foundation.framework/Headers/NSFormatter.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSImageCell</string>
+					<string key="superclassName">NSCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSImageCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenu</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenuItem</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenuItemCell</string>
+					<string key="superclassName">NSButtonCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSPopUpButton</string>
+					<string key="superclassName">NSButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSPopUpButtonCell</string>
+					<string key="superclassName">NSMenuItemCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSResponder</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSScrollView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSScroller</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSScroller.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSSplitView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSplitView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTableColumn</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableColumn.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTableHeaderView</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableHeaderView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTableView</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSText</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSText.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextField</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextFieldCell</string>
+					<string key="superclassName">NSActionCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextView</string>
+					<string key="superclassName">NSText</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTextView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSUserDefaultsController</string>
+					<string key="superclassName">NSController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindowController</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">showWindow:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">showWindow:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">showWindow:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
+					</object>
+				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
@@ -2265,9 +2676,9 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<string key="NSAddTemplate">{8, 8}</string>
-			<string key="NSMenuCheckmark">{11, 11}</string>
-			<string key="NSMenuMixedState">{10, 3}</string>
+			<string key="NSAddTemplate">{11, 11}</string>
+			<string key="NSMenuCheckmark">{12, 12}</string>
+			<string key="NSMenuMixedState">{10, 2}</string>
 			<string key="NSSwitch">{15, 15}</string>
 		</dictionary>
 	</data>

From d83c6e7b7a51ddef7a381ce79392093a41f42f11 Mon Sep 17 00:00:00 2001
From: equesada <eric.quesada@njin.fr>
Date: Tue, 13 Jan 2015 18:03:12 +0100
Subject: [PATCH 2/4] If the user set a default language, use it to set the
 editor current language when opening his project. If the user changed the
 default language, use the new value to set the editor current language.

---
 SpriteBuilder/ccBuilder/LocalizationEditorHandler.m | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorHandler.m b/SpriteBuilder/ccBuilder/LocalizationEditorHandler.m
index cd3dfe2d9..159e74b1b 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorHandler.m
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorHandler.m
@@ -194,7 +194,15 @@ - (void) setManagedFile:(NSString*) file
     
     if (activeLanguages.count > 0)
     {
-        [self setCurrentLanguage:[activeLanguages objectAtIndex:0]];
+        LocalizationEditorLanguage* initialLanguage = [activeLanguages objectAtIndex:0];
+        for (LocalizationEditorLanguage* lang in activeLanguages)
+        {
+            if (lang.defaultLanguage) {
+                initialLanguage = lang;
+                break;
+            }
+        }
+        [self setCurrentLanguage:initialLanguage];
     }
     else
     {
@@ -303,6 +311,7 @@ - (void) setDefaultLanguage:(LocalizationEditorLanguage*) lang
         if (lang && [oneLanguage.isoLangCode isEqualToString:lang.isoLangCode])
         {
             oneLanguage.defaultLanguage = YES;
+            [self setCurrentLanguage:oneLanguage];
         }
     }
 }

From 8f8ffd7f34e56a165da7798c7ce9f3d1e3772bd2 Mon Sep 17 00:00:00 2001
From: Eric Quesada <equesada@ludonkey.com>
Date: Tue, 13 Jan 2015 19:35:52 +0100
Subject: [PATCH 3/4] Fixed an issue, in the Default Language Selector, the
 selection was blank if the i18n editor was opened before to open the project.

---
 SpriteBuilder/ccBuilder/LocalizationEditorWindow.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
index a123d7b77..ff22bb41d 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
@@ -198,6 +198,7 @@ - (void) reload
     [self updateLanguageSelectionMenu];
     [self updateQuickEditLangs];
     [self updateInspector];
+    [self populateLanguageSetDefaultMenu];
 }
 
 #pragma mark Actions

From 2220868e88728af3685b503e7eceb842d77158be Mon Sep 17 00:00:00 2001
From: equesada <eric.quesada@njin.fr>
Date: Wed, 14 Jan 2015 17:29:36 +0100
Subject: [PATCH 4/4] The current Default Language (or "None" if there is not)
 is now ticked in selector.

---
 SpriteBuilder/ccBuilder/LocalizationEditorWindow.m | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
index ff22bb41d..9499d4eaf 100644
--- a/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
+++ b/SpriteBuilder/ccBuilder/LocalizationEditorWindow.m
@@ -47,20 +47,29 @@ - (void) populateLanguageSetDefaultMenu
     
     NSArray* langs = [AppDelegate appDelegate].localizationEditorHandler.activeLanguages;
     
+    int defaultLanguageIndex = -1;
     NSString* firstItem = @"Set Default Language";
     
     NSMutableArray* langTitles = [NSMutableArray array];
+    int currentLanguageIndex = 0;
     for (LocalizationEditorLanguage* lang in langs)
     {
         [langTitles addObject:lang.name];
         if (lang.defaultLanguage)
         {
             firstItem = [NSString stringWithFormat:@"Default: %@", lang.name];
+            defaultLanguageIndex = currentLanguageIndex;
         }
+        currentLanguageIndex++;
     }
     [langTitles addObject:@"None"];
+    if (defaultLanguageIndex == -1) {
+        defaultLanguageIndex = currentLanguageIndex;
+    }
     [langTitles insertObject:firstItem atIndex:0];
     [popLanguageSetDefault addItemsWithTitles:langTitles];
+    defaultLanguageIndex++;
+    [[popLanguageSetDefault itemAtIndex:defaultLanguageIndex] setState:NSOnState];
 }
 
 - (void) updateLanguageSelectionMenu