Merge pull request #2940 from wordpress-mobile/fix/cherrypick_locale_v3_fix

Cherry picking #2938 in 2.59.2

Author: oguzkocer

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/BaseWPComRestClient.java

@@ -26,7 +26,8 @@
 import okhttp3.HttpUrl;
 
 public abstract class BaseWPComRestClient {
-    private static final String WPCOM_V1_PREFIX = "/wpcom/v1";
+    private static final String WPCOM_V2_PREFIX = "/wpcom/v2";
+    private static final String WPCOM_V3_PREFIX = "/wpcom/v3";
     private static final String LOCALE_PARAM_NAME_FOR_V1 = "locale";
     private static final String LOCALE_PARAM_NAME_FOR_V2 = "_locale";
 
@@ -152,7 +153,8 @@ private void addAcceptHeaderIfNeeded(BaseRequest request) {
 
 
     private @NonNull String getLocaleParamName(@NonNull String url) {
-        return url.contains(WPCOM_V1_PREFIX) ? LOCALE_PARAM_NAME_FOR_V1 : LOCALE_PARAM_NAME_FOR_V2;
+        return url.contains(WPCOM_V2_PREFIX) || url.contains(WPCOM_V3_PREFIX) ? LOCALE_PARAM_NAME_FOR_V2
+                : LOCALE_PARAM_NAME_FOR_V1;
     }
 
     protected @Nullable HttpUrl getHttpUrlWithLocale(@NonNull String url) {