gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/6fe4b8ff (commit)
	 via  https://github.com/Gnucash/gnucash/commit/74fa5562 (commit)
	from  https://github.com/Gnucash/gnucash/commit/ddf84d07 (commit)



commit 6fe4b8ff8ea5dac4dc93c6eb2129eed80cc607ff
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 27 21:40:24 2016 -0700

    Reset release date to 28 June.

diff --git a/NEWS b/NEWS
index d2e8e21..9144fb8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 Version history:
 ------- -------
-2.6.13 - 26 June 2016
-Announcement: GnuCash 2.6.13 Release 2016-06-26
+2.6.13 - 28 June 2016
+Announcement: GnuCash 2.6.13 Release 2016-06-28
 GnuCash 2.6.13 released
 
 The GnuCash development team proudly announces GnuCash 2.6.13, the

commit 74fa5562868c9af0a8ffa98d7fe7d01dc27b8cc3
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 27 21:38:35 2016 -0700

    containsString wasn't introduced until OS X 10.10.

diff --git a/src/bin/gnucash-bin.c b/src/bin/gnucash-bin.c
index 4cd4af3..37a1bbc 100644
--- a/src/bin/gnucash-bin.c
+++ b/src/bin/gnucash-bin.c
@@ -267,6 +267,7 @@ mac_set_languages(NSArray* languages, NSString *lang_str)
     NSEnumerator *lang_iter = [languages objectEnumerator];
     NSArray *new_languages = [NSArray array];
     NSString *this_lang = NULL;
+    NSRange not_found = {NSNotFound, 0};
     while ((this_lang = [lang_iter nextObject])) {
         this_lang = [this_lang stringByTrimmingCharactersInSet:
                      [NSCharacterSet characterSetWithCharactersInString: @"\""]];
@@ -274,7 +275,7 @@ mac_set_languages(NSArray* languages, NSString *lang_str)
         new_languages = [new_languages arrayByAddingObject: this_lang];
 /* If it's an English language, add the "C" locale after it so that
  * any messages can default to it */
-        if ( [this_lang containsString: @"en"])
+        if (!NSEqualRanges([this_lang String: @"en"], not_found))
             new_languages = [new_languages arrayByAddingObject: @"C"];
         if (![new_languages containsObject: lang_str]) {
             NSArray *temp_array = [NSArray arrayWithObject: lang_str];



Summary of changes:
 NEWS                  | 4 ++--
 src/bin/gnucash-bin.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)