Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java

@@ -39,6 +39,7 @@ public class OpeningHoursParser {
 		DateFormatSymbols dateFormatSymbols = DateFormatSymbols.getInstance(Locale.US);
 		monthsStr = dateFormatSymbols.getShortMonths();
 		daysStr = getTwoLettersStringArray(dateFormatSymbols.getShortWeekdays());
+		
 		dateFormatSymbols = DateFormatSymbols.getInstance();
 		localMothsStr = dateFormatSymbols.getShortMonths();
 		localDaysStr = getTwoLettersStringArray(dateFormatSymbols.getShortWeekdays());
@@ -78,8 +79,8 @@ public class OpeningHoursParser {
 		String[] newStrings = new String[strings.length];
 		for (int i = 0; i < strings.length; i++) {
 			if (strings[i] != null) {
-				if (strings[i].length() > 2) {
-					newStrings[i] = Algorithms.capitalizeFirstLetter(strings[i].substring(0, 2));
+				if (strings[i].length() > 3) {
+					newStrings[i] = Algorithms.capitalizeFirstLetter(strings[i].substring(0, 3));
 				} else {
 					newStrings[i] = Algorithms.capitalizeFirstLetter(strings[i]);
 				}

OsmAnd/AndroidManifest-free.xml

@@ -6,6 +6,10 @@
         android:icon="@mipmap/icon_free"
 		android:label="@string/app_name_free"
         tools:replace="android:icon, android:label">
+
+        <meta-data android:name="com.facebook.sdk.ApplicationId" android:resource="@string/facebook_app_id"/>
+        <activity android:name="com.facebook.FacebookActivity"/>
+
         <activity
             android:name="net.osmand.plus.activities.MapActivity"
             android:theme="@style/FirstSplashScreenFree"

OsmAnd/build.gradle

@@ -380,7 +380,7 @@ dependencies {
 	if (analytics) {
 		compile 'com.google.firebase:firebase-core:9.8.0'
 		compile 'com.google.firebase:firebase-config:9.8.0'
-
+		implementation 'com.facebook.android:facebook-android-sdk:[4,5)'
 	}
 	// compile project(':eclipse-compile:design')
 	// compile project(':eclipse-compile:cardview')

OsmAnd/no_translate.xml

@@ -5,6 +5,7 @@
     <!-- string name="app_version_suffix"></string -->
 
     <!-- Not translatable -->
+    <string name="facebook_app_id">2057524931189530</string>
     <string name="full_version_price">€7,99</string>
     <string name="osm_live">OsmAnd Live</string>
     <string name="ga_api_key">UA-28342846-2</string>