Generate fr/gtfs_rts_strings.xml & ignore location inside agency name.

shared-modules/MTREADME.md.MT.sh

@@ -41,7 +41,7 @@ fi
 
 AGENCY_LABEL=$AGENCY_NAME_LONG;
 
-if [ -n "$AGENCY_LOCATION_SHORT" ]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL" != *"$AGENCY_LOCATION_SHORT"* ]]; then
   AGENCY_LABEL="$AGENCY_LOCATION_SHORT $AGENCY_LABEL"
 fi
 

shared-modules/app-android/src/main/play/listings/en-US/MTfull-description.txt.MT.sh

@@ -76,8 +76,8 @@ if [ -f "$PARENT_AGENCY_NAME_FILE" ]; then
     fi
 fi
 
-if [ -n "$AGENCY_LOCATION_SHORT" ]; then
-  AGENCY_LABEL="$AGENCY_LOCATION_SHORT $AGENCY_LABEL"
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL" != *"$AGENCY_LOCATION_SHORT"* ]]; then
+  AGENCY_LABEL="$AGENCY_LOCATION_SHORT $AGENCY_LABEL";
 fi
 
 GIT_OWNER="mtransitapps"; #TODO extract from GIT_REMOTE_URL=$(git config --get remote.origin.url); # 'git@github.com:owner/repo.git' or 'https://github.com/owner/repo'.

shared-modules/app-android/src/main/play/listings/en-US/MTshort-description.txt.MT.sh

@@ -116,7 +116,7 @@ if [ -f "$AGENCY_TYPE_FILE" ]; then
 fi
 
 AGENCY_LABEL=$AGENCY_NAME_SHORT;
-if [ -n "$AGENCY_LOCATION_SHORT" ]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL" != *"$AGENCY_LOCATION_SHORT"* ]]; then
   AGENCY_LABEL="$AGENCY_LOCATION_SHORT $AGENCY_LABEL"
 fi
 
@@ -149,6 +149,10 @@ if [ -f "${GTFS_RT_FILE}" ]; then
     fi
   fi
 fi
+STM_INFO_VALUES_FILE="${VALUES_DIR}/stm_info_values.xml";
+if [ -f "${STM_INFO_VALUES_FILE}" ]; then
+  SHORT_DESC="${SHORT_DESC} Service Updates.";
+fi
 # TODO: support other real-time providers
 
 RSS_FILE="${VALUES_DIR}/rss_values.xml";

shared-modules/app-android/src/main/play/listings/en-US/MTtitle.txt.MT.sh

@@ -121,7 +121,7 @@ AGENCY_LABEL=$AGENCY_NAME_SHORT;
 
 AGENCY_LABEL_AND_LOCATION_SHORT_LENGTH=$((${#AGENCY_LABEL} + ${#AGENCY_LOCATION_SHORT} + $TYPE_LABEL_MIN_LENGTH));
 
-if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL_AND_LOCATION_SHORT_LENGTH" -lt "$MAX_LENGTH" ]]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL" != *"$AGENCY_LOCATION_SHORT"* && "$AGENCY_LABEL_AND_LOCATION_SHORT_LENGTH" -lt "$MAX_LENGTH" ]]; then
   AGENCY_LABEL="$AGENCY_LOCATION_SHORT $AGENCY_LABEL"
 fi
 

shared-modules/app-android/src/main/play/listings/fr-FR/MTfull-description.txt.MT.sh

@@ -10,8 +10,6 @@ setGitProjectName;
 
 setIsCI;
 
-echo ">> Generating fr-FR/full-description.txt...";
-
 APP_ANDROID_DIR="${ROOT_DIR}/app-android";
 SRC_DIR="${APP_ANDROID_DIR}/src";
 MAIN_DIR="${SRC_DIR}/main";
@@ -25,6 +23,8 @@ if [[ ! -f "$LANG_FR_FILE" && ! -d "$FR_FR_DIR" ]]; then
     exit 0; # ok
 fi
 
+echo ">> Generating fr-FR/full-description.txt...";
+
 FULL_DESCRIPTION_FILE="${FR_FR_DIR}/full-description.txt";
 mkdir -p "${FR_FR_DIR}";
 checkResult $?;
@@ -86,7 +86,7 @@ if [ -f "$PARENT_AGENCY_NAME_FILE" ]; then
     fi
 fi
 
-if [ -n "$AGENCY_LOCATION_SHORT" ]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL" != *"$AGENCY_LOCATION_SHORT"* ]]; then
   AGENCY_LABEL="$AGENCY_LABEL de $AGENCY_LOCATION_SHORT"
 fi
 
@@ -226,7 +226,7 @@ if [ -z "$TYPE" ]; then
 fi
 TYPE_LABEL="";
 if [ "$TYPE" -eq 0 ]; then # LIGHT_RAIL
-    TYPE_LABEL="trains léger"; # TODO?
+    TYPE_LABEL="trains légers"; # TODO?
 elif [ "$TYPE" -eq 1 ]; then # SUBWAY
     TYPE_LABEL="métros";
 elif [ "$TYPE" -eq 2 ]; then # TRAIN
@@ -255,7 +255,7 @@ if [ -f "$BIKE_STATION_VALUES_FILE" ]; then
 fi
 GTFS_RDS_VALUES_FILE="${VALUES_DIR}/gtfs_rts_values.xml"; # do not change to avoid breaking compat w/ old modules
 if [ -f "$GTFS_RDS_VALUES_FILE" ]; then
-  PROVIDES_LINE="${PROVIDES_LINE} les horaires (accessible hors-ligne)";
+  PROVIDES_LINE="${PROVIDES_LINE} l'horaire (accessible hors-ligne)";
   if [ -n "$INFORMATION_LIST" ]; then
     INFORMATION_LIST="${INFORMATION_LIST},";
   fi
@@ -384,7 +384,7 @@ Cette application ajoute les informations des $TYPE_LABEL $AGENCY_LABEL à MonTr
 
 $PROVIDES_LINE.
 
-Les $TYPE_LABEL de $AGENCY_NAME_SHORT $OPERATE_IN $LOCATION_LABEL.
+Les $TYPE_LABEL $AGENCY_NAME_SHORT $OPERATE_IN $LOCATION_LABEL.
 
 Une fois cette application installée, l'application MonTransit affichera les informations des $TYPE_LABEL ($INFORMATION_LIST...).
 
@@ -398,7 +398,7 @@ $SOURCE_URL
 Cette application est gratuite et open-source :
 $CONTACT_WEBSITE_URL
 
-Cette application n'est pas associée à $NOT_RELATED_WITH.
+Cette application n'est pas associée à : $NOT_RELATED_WITH.
 EOL
 
 PERMISSIONS_LINE="";

shared-modules/app-android/src/main/play/listings/fr-FR/MTshort-description.txt.MT.sh

@@ -8,8 +8,6 @@ source ${COMMONS_DIR}/feature_flags.sh;
 
 setIsCI;
 
-echo ">> Generating fr-FR/short-description.txt...";
-
 APP_ANDROID_DIR="${ROOT_DIR}/app-android";
 SRC_DIR="${APP_ANDROID_DIR}/src";
 MAIN_DIR="${SRC_DIR}/main";
@@ -23,6 +21,8 @@ if [[ ! -f "$LANG_FR_FILE" && ! -d "$FR_FR_DIR" ]]; then
     exit 0; # ok
 fi
 
+echo ">> Generating fr-FR/short-description.txt...";
+
 SHORT_DESCRIPTION_FILE="${FR_FR_DIR}/short-description.txt";
 mkdir -p "${FR_FR_DIR}";
 checkResult $?;
@@ -118,7 +118,7 @@ else
 fi
 
 AGENCY_LABEL=$AGENCY_NAME_SHORT;
-if [ -n "$AGENCY_LOCATION_SHORT" ]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL" != *"$AGENCY_LOCATION_SHORT"* ]]; then
   AGENCY_LABEL="$AGENCY_LABEL de $AGENCY_LOCATION_SHORT"
 fi
 
@@ -151,6 +151,10 @@ if [ -f "${GTFS_RT_FILE}" ]; then
     fi
   fi
 fi
+STM_INFO_VALUES_FILE="${VALUES_DIR}/stm_info_values.xml";
+if [ -f "${STM_INFO_VALUES_FILE}" ]; then
+  SHORT_DESC="${SHORT_DESC} État de service.";
+fi
 # TODO: support other real-time providers
 
 RSS_FILE="${VALUES_DIR}/rss_values.xml";

shared-modules/app-android/src/main/play/listings/fr-FR/MTtitle.txt.MT.sh

@@ -7,8 +7,6 @@ source ${COMMONS_DIR}/commons.sh;
 
 setIsCI;
 
-echo ">> Generating fr-FR/title.txt...";
-
 APP_ANDROID_DIR="${ROOT_DIR}/app-android";
 SRC_DIR="${APP_ANDROID_DIR}/src";
 MAIN_DIR="${SRC_DIR}/main";
@@ -22,6 +20,8 @@ if [[ ! -f "$LANG_FR_FILE" && ! -d "$FR_FR_DIR" ]]; then
     exit 0; # ok
 fi
 
+echo ">> Generating fr-FR/title.txt...";
+
 TITLE_FILE="${FR_FR_DIR}/title.txt";
 mkdir -p "${FR_FR_DIR}";
 checkResult $?;
@@ -122,7 +122,7 @@ AGENCY_LABEL=$AGENCY_NAME_SHORT;
 
 AGENCY_LABEL_AND_LOCATION_SHORT_LENGTH=$((${#AGENCY_LABEL} + ${#AGENCY_LOCATION_SHORT}));
 
-if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL_AND_LOCATION_SHORT_LENGTH" -lt "$MAX_LENGTH" ]]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL" != *"$AGENCY_LOCATION_SHORT"* && "$AGENCY_LABEL_AND_LOCATION_SHORT_LENGTH" -lt "$MAX_LENGTH" ]]; then
   AGENCY_LABEL="$AGENCY_LABEL $AGENCY_LOCATION_SHORT"
 fi
 

shared-modules/app-android/src/main/res/values-fr/MTbike_station_strings.xml.MT.sh

@@ -9,8 +9,6 @@ setGitProjectName;
 
 setIsCI;
 
-echo ">> Generating values-fr/bike_station_strings.xml...";
-
 APP_ANDROID_DIR="${ROOT_DIR}/app-android";
 SRC_DIR="${APP_ANDROID_DIR}/src";
 MAIN_DIR="${SRC_DIR}/main";
@@ -29,6 +27,8 @@ if [ ! -f "${BIKE_STATION_VALUES_FILE}" ]; then
     exit 0; # ok
 fi
 
+echo ">> Generating values-fr/bike_station_strings.xml...";
+
 BIKE_STATION_STRINGS_FILE="${VALUES_FR_DIR}/bike_station_strings.xml";
 mkdir -p "${VALUES_FR_DIR}";
 checkResult $?;

shared-modules/app-android/src/main/res/values-fr/MTgtfs_rts_strings.xml.MT.sh

@@ -0,0 +1,132 @@
+#!/bin/bash
+SCRIPT_DIR="$(dirname "$0")";
+
+ROOT_DIR="$SCRIPT_DIR/../../../../../../..";
+COMMONS_DIR="${ROOT_DIR}/commons";
+source ${COMMONS_DIR}/commons.sh;
+
+setGitProjectName;
+
+setIsCI;
+
+APP_ANDROID_DIR="${ROOT_DIR}/app-android";
+SRC_DIR="${APP_ANDROID_DIR}/src";
+MAIN_DIR="${SRC_DIR}/main";
+RES_DIR="${MAIN_DIR}/res";
+VALUES_FR_DIR="${RES_DIR}/values-fr";
+
+LANG_FR_FILE="${ROOT_DIR}/config/lang/fr";
+if [[ ! -f "$LANG_FR_FILE" && ! -d "$VALUES_FR_DIR" ]]; then
+    echo ">> Generating values-fr/gtfs_rts_strings.xml... SKIP (FR lang not supported)";
+    exit 0; # ok
+fi
+
+GTFS_RDS_VALUES_FILE="${ROOT_DIR}/app-android/src/main/res/values/gtfs_rts_values.xml"; # do not change to avoid breaking compat w/ old modules
+if [ ! -f "${GTFS_RDS_VALUES_FILE}" ]; then
+    echo ">> Generating values-fr/gtfs_rts_strings.xml... SKIP (not an rds agency)";
+    exit 0; # ok
+fi
+
+echo ">> Generating values-fr/gtfs_rts_strings.xml...";
+
+GTFS_RTS_STRINGS_FILE="${VALUES_FR_DIR}/gtfs_rts_strings.xml";
+mkdir -p "${VALUES_FR_DIR}";
+checkResult $?;
+if [ -f "${GTFS_RTS_STRINGS_FILE}" ]; then
+  echo ">> File '$GTFS_RTS_STRINGS_FILE' already exist."; # compat with existing values-fr/gtfs_rts_strings.xml
+  exit 0; # compat w/ manually created file
+fi
+
+rm -f "${GTFS_RTS_STRINGS_FILE}";
+checkResult $?;
+touch "${GTFS_RTS_STRINGS_FILE}";
+checkResult $?;
+
+CONFIG_DIR="${ROOT_DIR}/config";
+if [ ! -d "$CONFIG_DIR" ]; then
+    echo "$CONFIG_DIR doesn't exist!";
+    exit 1;
+fi
+
+AGENCY_NAME_FILE="${CONFIG_DIR}/fr/agency_name";
+if [ ! -f "$AGENCY_NAME_FILE" ]; then
+  AGENCY_NAME_FILE="${CONFIG_DIR}/agency_name";
+fi
+if [ ! -f "$AGENCY_NAME_FILE" ]; then
+    echo "$AGENCY_NAME_FILE doesn't exist!";
+    exit 1;
+fi
+
+AGENCY_NAME_LONG=$(tail -n 1 $AGENCY_NAME_FILE);
+if [ -z "$AGENCY_NAME_LONG" ]; then
+    echo "AGENCY_NAME_LONG is empty!";
+    exit 1;
+fi
+
+AGENCY_NAME_SHORT=$(head -n 1 $AGENCY_NAME_FILE);
+if [ -z "$AGENCY_NAME_SHORT" ]; then
+    echo "AGENCY_NAME_SHORT is empty!";
+    exit 1;
+fi
+
+requireCommand "xmllint" "libxml2-utils";
+requireCommand "jq";
+
+GTFS_CONFIG_DIR="${CONFIG_DIR}/gtfs";
+GTFS_RDS_VALUES_GEN_FILE="${ROOT_DIR}/app-android/src/main/res/values/gtfs_rts_values_gen.xml"; # do not change to avoid breaking compat w/ old modules
+AGENCY_JSON_FILE="${GTFS_CONFIG_DIR}/agency.json";
+TYPE=-1;
+if [ -f $GTFS_RDS_VALUES_GEN_FILE ]; then
+  # https://github.com/mtransitapps/parser/blob/master/src/main/java/org/mtransit/parser/gtfs/data/GRouteType.kt
+  TYPE=$(xmllint --xpath "//resources/integer[@name='gtfs_rts_agency_type']/text()" "$GTFS_RDS_VALUES_GEN_FILE")
+elif [ -f $AGENCY_JSON_FILE ]; then
+  # https://github.com/mtransitapps/parser/blob/master/src/main/java/org/mtransit/parser/gtfs/data/GRouteType.kt
+  TYPE=$(jq '.target_route_type_id // empty' "$AGENCY_JSON_FILE")
+else
+  echo "> No agency file! (rds:$GTFS_RDS_VALUES_GEN_FILE|json:$AGENCY_JSON_FILE)"
+  exit 1 # error
+fi
+if [ -z "$TYPE" ]; then
+  echo " > No type found for agency!"
+  exit 1 # error
+fi
+TYPE_LABEL="";
+if [ "$TYPE" -eq 0 ]; then # LIGHT_RAIL
+    TYPE_LABEL="trains légers"; # TODO?
+elif [ "$TYPE" -eq 1 ]; then # SUBWAY
+    TYPE_LABEL="métros";
+elif [ "$TYPE" -eq 2 ]; then # TRAIN
+    TYPE_LABEL="trains";
+elif [ "$TYPE" -eq 3 ]; then # BUS
+    TYPE_LABEL="autobus";
+elif [ "$TYPE" -eq 4 ]; then # FERRY
+    TYPE_LABEL="bateaux";
+else
+  echo "Unexpected agency type '$TYPE'!"
+  exit 1 # error
+fi
+
+AGENCY_TYPE_FILE="${CONFIG_DIR}/agency_type";
+if [ -f "$AGENCY_TYPE_FILE" ]; then
+  AGENCY_TYPE_SHORT=$(head -n 1 "$AGENCY_TYPE_FILE");
+  if [ -n "$AGENCY_TYPE_SHORT" ]; then
+    TYPE_LABEL="$AGENCY_TYPE_SHORT";
+  fi
+fi
+
+cat >>"${GTFS_RTS_STRINGS_FILE}" <<EOL
+<?xml version="1.0" encoding="utf-8"?>
+<!-- DO NOT EDIT: this file is generated by MTgtfs_rts_strings.xml.MT.sh -->
+<resources>
+    <string name="gtfs_rts_label">$AGENCY_NAME_LONG $TYPE_LABEL</string>
+    <string name="gtfs_rts_short_name">$AGENCY_NAME_SHORT</string>
+</resources>
+EOL
+
+if [[ ${IS_CI} = true ]]; then
+  echo "---------------------------------------------------------------------------------------------------------------";
+  cat "${GTFS_RTS_STRINGS_FILE}"; #DEBUG
+  echo "---------------------------------------------------------------------------------------------------------------";
+fi
+
+echo ">> Generating values-fr/gtfs_rts_strings.xml... DONE";

shared-modules/app-android/src/main/res/values-fr/MTstrings.xml.MT.sh

@@ -9,8 +9,6 @@ setGitProjectName;
 
 setIsCI;
 
-echo ">> Generating values-fr/strings.xml...";
-
 APP_ANDROID_DIR="${ROOT_DIR}/app-android";
 SRC_DIR="${APP_ANDROID_DIR}/src";
 MAIN_DIR="${SRC_DIR}/main";
@@ -23,6 +21,8 @@ if [[ ! -f "$LANG_FR_FILE" && ! -d "$VALUES_FR_DIR" ]]; then
     exit 0; # ok
 fi
 
+echo ">> Generating values-fr/strings.xml...";
+
 STRINGS_FILE="${VALUES_FR_DIR}/strings.xml";
 mkdir -p "${VALUES_FR_DIR}";
 checkResult $?;
@@ -90,7 +90,7 @@ if [ -z "$TYPE" ]; then
 fi
 TYPE_LABEL="";
 if [ "$TYPE" -eq 0 ]; then # LIGHT_RAIL
-    TYPE_LABEL="trains léger"; # TODO?
+    TYPE_LABEL="trains légers"; # TODO?
 elif [ "$TYPE" -eq 1 ]; then # SUBWAY
     TYPE_LABEL="métros";
 elif [ "$TYPE" -eq 2 ]; then # TRAIN
@@ -135,7 +135,7 @@ else
 fi
 
 LOCATION_LABEL="";
-if [ -n "$AGENCY_LOCATION_SHORT" ]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_NAME_SHORT" != *"$AGENCY_LOCATION_SHORT"* ]]; then
     LOCATION_LABEL="$AGENCY_LOCATION_SHORT";
 elif [ -n "$STATE_LABEL_LONG" ]; then
     LOCATION_LABEL="$STATE_LABEL_LONG";

shared-modules/app-android/src/main/res/values/MTgtfs_rts_strings.xml.MT.sh

@@ -119,4 +119,4 @@ if [[ ${IS_CI} = true ]]; then
   echo "---------------------------------------------------------------------------------------------------------------";
 fi
 
-echo ">> Generating gtfs_rts_strings.xml... DONE";
+echo ">> Generating gtfs_rts_strings.xml... DONE";

shared-modules/app-android/src/main/res/values/MTstrings.xml.MT.sh

@@ -132,7 +132,7 @@ else
 fi
 
 LOCATION_LABEL="";
-if [ -n "$AGENCY_LOCATION_SHORT" ]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_NAME_SHORT" != *"$AGENCY_LOCATION_SHORT"* ]]; then
     LOCATION_LABEL="$AGENCY_LOCATION_SHORT";
 elif [ -n "$STATE_LABEL_LONG" ]; then
     LOCATION_LABEL="$STATE_LABEL_LONG";

shared-modules/gh_repo_update_details.sh

@@ -34,7 +34,7 @@ fi
 
 AGENCY_LABEL=$AGENCY_NAME_LONG;
 
-if [ -n "$AGENCY_LOCATION_SHORT" ]; then
+if [[ -n "$AGENCY_LOCATION_SHORT" && "$AGENCY_LABEL" != *"$AGENCY_LOCATION_SHORT"* ]]; then
   AGENCY_LABEL="$AGENCY_LOCATION_SHORT $AGENCY_LABEL"
 fi
 

shared/app-android/MT.gitignore

@@ -76,6 +76,7 @@ proguard/
 /src/main/res/values/module_app_icon_color.xml
 /src/main/res/values/parent_agency_values.xml
 /src/main/res/values-fr/bike_station_strings.xml
+/src/main/res/values-fr/gtfs_rts_strings.xml
 /src/main/res/values-fr/strings.xml
 
 # trigger change 1