Commit a25b67ef authored by 6e6e58c4's avatar 6e6e58c4 Committed by Andreas Kuchenbecker
Browse files

Use 'Tracking' instead of 'UTM' in code and translations to better match the actual function

parent b31698f8

app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java

+7 −7
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ public class Helper { 
     * - Firefox: https://firefox.settings.services.mozilla.com/v1/buckets/main/collections/query-stripping/records

     * - Brave: https://github.com/brave/brave-core/blob/master/components/query_filter/utils.cc

     */

    private static final String[] UTM_PARAMS = {

    private static final String[] TRACKING_PARAMS = {

            "utm_\\w+",

            "ref_\\w+",

            "__hsfp",
@@ -882,8 +882,8 @@ public class Helper { 
                return "https://" + wikipediaReplaceHost + "/" + path + lang;

            }

        }

        boolean filterUTM = Helper.getSharedValue(context, context.getString(R.string.SET_FILTER_UTM));

        if (filterUTM) {

        boolean filterTracking = Helper.getSharedValue(context, context.getString(R.string.SET_FILTER_TRACKING));

        if (filterTracking) {

            return remove_tracking_param(context, url);

        }

        return url;
@@ -900,10 +900,10 @@ public class Helper { 
        if (original_content == null)

            return original_content;

        String cleaned_content = original_content;

        for (String utm : UTM_PARAMS) {

            cleaned_content = cleaned_content.replaceAll("&" + utm + "=[0-9a-zA-Z._-]*", "");

            cleaned_content = cleaned_content.replaceAll("&" + utm + "=[0-9a-zA-Z._-]*", "");

            cleaned_content = cleaned_content.replaceAll("\\?" + utm + "=[0-9a-zA-Z._-]*", "?");

        for (String param : TRACKING_PARAMS) {

            cleaned_content = cleaned_content.replaceAll("&" + param + "=[0-9a-zA-Z._-]*", "");

            cleaned_content = cleaned_content.replaceAll("&" + param + "=[0-9a-zA-Z._-]*", "");

            cleaned_content = cleaned_content.replaceAll("\\?" + param + "=[0-9a-zA-Z._-]*", "?");

        }

        if (cleaned_content.endsWith("?")) {

            cleaned_content = cleaned_content.substring(0, cleaned_content.length() - 1);

app/src/main/res/values-ar/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -571,8 +571,8 @@ 
    <string name="check_redirect">تحقّق مِن إعادة التوجيه</string>

    <string name="no_redirect">هذا العنوان لا يحوّل إلى عنوان آخر</string>

    <string name="redirect_detected">%1$s \n\nيُحوّل إلى\n\n %2$s</string>

    <string name="set_utm_parameters">أزل معلّمات UTM</string>

    <string name="set_utm_parameters_indication">يقوم التطبيق تلقائيا بإزالة معلمات UTM مِن عناوين المواقع قبل زيارة الرابط.</string>

    <string name="set_tracking_parameters">إزالة معلمات التتبع</string>

    <string name="set_tracking_parameters_indication">يقوم التطبيق تلقائيًا بإزالة معلمات التتبع من عناوين URL قبل زيارة الرابط.</string>

    <string name="talking_about">%d أشخاص يتحدثون عن ذلك</string>

    <string name="twitter_accounts">حسابات تويتر (عبر Nitter)</string>

    <string name="list_of_twitter_accounts">أسماء حسابات تويتر مُفرّقة بمسافة بيضاء</string>

app/src/main/res/values-ber/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -518,8 +518,8 @@ 
    <string name="check_redirect">Check redirect</string>

    <string name="no_redirect">This URL does not redirect</string>

    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>

    <string name="set_utm_parameters">Remove UTM parameters</string>

    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>

    <string name="set_tracking_parameters">Remove tracking parameters</string>

    <string name="set_tracking_parameters_indication">The app will automatically remove tracking parameters from URLs before visiting a link.</string>

    <string name="talking_about">%d people talking</string>

    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>

    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>

app/src/main/res/values-bn/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -550,8 +550,8 @@ 
    <string name="check_redirect">Check redirect</string>

    <string name="no_redirect">This URL does not redirect</string>

    <string name="redirect_detected">%1$s \n\nredirects to\n\n %2$s</string>

    <string name="set_utm_parameters">Remove UTM parameters</string>

    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>

    <string name="set_tracking_parameters">Remove tracking parameters</string>

    <string name="set_tracking_parameters_indication">The app will automatically remove tracking parameters from URLs before visiting a link.</string>

    <string name="talking_about">%d people talking</string>

    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>

    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>

app/src/main/res/values-br/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -579,8 +579,8 @@ 
\nredirects to

\n

\n %2$s</string>

    <string name="set_utm_parameters">Remove UTM parameters</string>

    <string name="set_utm_parameters_indication">The app will automatically remove UTM parameters from URLs before visiting a link.</string>

    <string name="set_tracking_parameters">Remove tracking parameters</string>

    <string name="set_tracking_parameters_indication">The app will automatically remove tracking parameters from URLs before visiting a link.</string>

    <string name="talking_about">%d people talking</string>

    <string name="twitter_accounts">Twitter accounts (via Nitter)</string>

    <string name="list_of_twitter_accounts">Twitter usernames space separated</string>