Revert "Modify l10n string extraction script to copy strings to SAE."

This reverts commit c61490c0b4.

Signal.xcodeproj/project.pbxproj

@@ -49,7 +49,6 @@
 		348F2EAE1F0D21BC00D4ECE0 /* DeviceSleepManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 348F2EAD1F0D21BC00D4ECE0 /* DeviceSleepManager.swift */; };
 		3497DBEC1ECE257500DB2605 /* OWSCountryMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 3497DBEB1ECE257500DB2605 /* OWSCountryMetadata.m */; };
 		3497DBEF1ECE2E4700DB2605 /* DomainFrontingCountryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3497DBEE1ECE2E4700DB2605 /* DomainFrontingCountryViewController.m */; };
-		34ADAD8A1FD0B19200AB8830 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 34ADAD881FD0B19200AB8830 /* Localizable.strings */; };
 		34B0796D1FCF46B100E248C2 /* MainAppContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B0796B1FCF46B000E248C2 /* MainAppContext.m */; };
 		34B3F8711E8DF1700035BE1A /* AboutTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8351E8DF1700035BE1A /* AboutTableViewController.m */; };
 		34B3F8721E8DF1700035BE1A /* AdvancedSettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B3F8371E8DF1700035BE1A /* AdvancedSettingsTableViewController.m */; };
@@ -538,7 +537,6 @@
 		3497DBEB1ECE257500DB2605 /* OWSCountryMetadata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSCountryMetadata.m; sourceTree = "<group>"; };
 		3497DBED1ECE2E4700DB2605 /* DomainFrontingCountryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DomainFrontingCountryViewController.h; sourceTree = "<group>"; };
 		3497DBEE1ECE2E4700DB2605 /* DomainFrontingCountryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DomainFrontingCountryViewController.m; sourceTree = "<group>"; };
-		34ADAD891FD0B19200AB8830 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = translations/en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		34B0796B1FCF46B000E248C2 /* MainAppContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainAppContext.m; sourceTree = "<group>"; };
 		34B0796C1FCF46B000E248C2 /* MainAppContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainAppContext.h; sourceTree = "<group>"; };
 		34B0796E1FD07B1E00E248C2 /* SignalShareExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SignalShareExtension.entitlements; sourceTree = "<group>"; };
@@ -920,6 +918,7 @@
 		B660F6AD1C29868000687D6E /* FunctionalUtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FunctionalUtilTest.m; sourceTree = "<group>"; };
 		B660F6B31C29868000687D6E /* UtilTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UtilTest.h; sourceTree = "<group>"; };
 		B660F6B41C29868000687D6E /* UtilTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UtilTest.m; sourceTree = "<group>"; };
+		B661C211198EE2EA00548CA1 /* iOSVersions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iOSVersions.h; path = src/environment/iOSVersions.h; sourceTree = "<group>"; };
 		B66DBF4919D5BBC8006EA940 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		B676BCEF1AA544E7009637B8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = translations/de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		B676BCF01AA544F5009637B8 /* el_GR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el_GR; path = translations/el_GR.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -1390,7 +1389,6 @@
 		453518691FC635DD00210559 /* SignalShareExtension */ = {
 			isa = PBXGroup;
 			children = (
-				34ADAD881FD0B19200AB8830 /* Localizable.strings */,
 				4535186F1FC635DD00210559 /* Info.plist */,
 				4535186C1FC635DD00210559 /* MainInterface.storyboard */,
 				4535186A1FC635DD00210559 /* ShareViewController.swift */,
@@ -1954,6 +1952,7 @@
 				D221A099169C9E5E00537ABF /* main.m */,
 				D221A095169C9E5E00537ABF /* Signal-Info.plist */,
 				D221A09B169C9E5E00537ABF /* Signal-Prefix.pch */,
+				B661C211198EE2EA00548CA1 /* iOSVersions.h */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -2249,7 +2248,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				4535186E1FC635DD00210559 /* MainInterface.storyboard in Resources */,
-				34ADAD8A1FD0B19200AB8830 /* Localizable.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2960,14 +2958,6 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
-		34ADAD881FD0B19200AB8830 /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				34ADAD891FD0B19200AB8830 /* en */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
 		4535186C1FC635DD00210559 /* MainInterface.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (

Signal/translations/bin/auto-genstrings

@@ -12,8 +12,7 @@ SM_DIR="./SignalMessaging"
 
 TARGETS="Signal/src ${SSK_DIR} ${SAE_DIR} ${SM_DIR}"
 TMP="$(mktemp -d)"
-MAIN_STRINGFILE="Signal/translations/en.lproj/Localizable.strings"
-SAE_STRINGFILE="SignalShareExtension/translations/en.lproj/Localizable.strings"
+STRINGFILE="Signal/translations/en.lproj/Localizable.strings"
 
 # Assert preconditions before we do any work
 # We're more likely to notice errors this way
@@ -40,8 +39,8 @@ fi
 find $TARGETS -name "*.m" -print0 -o -name "*.h" -print0 -o -name "*.swift" -print0 | xargs -0 genstrings -o $TMP
 
 # We have to convert the new .strings files to UTF-8 in order to deal with them
-# MAIN_STRINGFILE is already UTF-8.
-OLDUTF8=$(cat $MAIN_STRINGFILE)
+# STRINGFILE is already UTF-8.
+OLDUTF8=$(cat $STRINGFILE)
 NEWUTF8=$(iconv -f UTF-16 -t UTF-8 $TMP/Localizable.strings)
 
 # Let's merge the old with the new .strings file:
@@ -57,7 +56,7 @@ echo "$OLDUTF8" | grep -Eo '^".*"' | \
 		{$2 = ($1 in a ? a[$1] : $2); \
 		if($2 ~ /"[;]*$/){$2 = " = "$2}; \
 		if($2 ~ /"$/){$2 = $2";"}; \
-		print}' - <(echo "$NEWUTF8") > $MAIN_STRINGFILE
+		print}' - <(echo "$NEWUTF8") > $STRINGFILE
 
 # Copy in strings from JSQMessagesViewController
 #
@@ -67,8 +66,6 @@ echo "$OLDUTF8" | grep -Eo '^".*"' | \
 
 echo "Copying strings from JSQMessagesViewController"
 echo "
-// Strings Copied in from JSQMessagesViewController" >> $MAIN_STRINGFILE
-cat $JSQ_STRINGS_PATH  | grep -v "^//" >> $MAIN_STRINGFILE
+// Strings Copied in from JSQMessagesViewController" >> $STRINGFILE
+cat $JSQ_STRINGS_PATH  | grep -v "^//" >> $STRINGFILE
 
-echo "Copying strings from to iOS Share Extension"
-cp $MAIN_STRINGFILE $SAE_STRINGFILE