From 34f99a1ae2d246a803bea428d897fac5ae42d23a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20M=C3=A9a?= Date: Thu, 9 Apr 2026 10:12:55 -0400 Subject: [PATCH 1/4] Module generated files improvements --- .../en-US/MTfull-description.txt.MT.sh | 7 +++++- .../en-US/MTshort-description.txt.MT.sh | 22 ++++++++++++++----- .../fr-FR/MTfull-description.txt.MT.sh | 17 +++++++++++--- .../fr-FR/MTshort-description.txt.MT.sh | 22 +++++++++++++++---- .../play/listings/fr-FR/MTtitle.txt.MT.sh | 5 ++++- .../MTbike_station_strings.xml.MT.sh | 5 ++++- .../main/res/values-fr/MTstrings.xml.MT.sh | 11 ++++++---- .../src/main/res/values/MTstrings.xml.MT.sh | 2 +- shared/.idea/codeStyles/Project.xml | 7 +++++- 9 files changed, 77 insertions(+), 21 deletions(-) diff --git a/shared-modules/app-android/src/main/play/listings/en-US/MTfull-description.txt.MT.sh b/shared-modules/app-android/src/main/play/listings/en-US/MTfull-description.txt.MT.sh index c566d543..9c9541b1 100755 --- a/shared-modules/app-android/src/main/play/listings/en-US/MTfull-description.txt.MT.sh +++ b/shared-modules/app-android/src/main/play/listings/en-US/MTfull-description.txt.MT.sh @@ -331,6 +331,11 @@ setFeatureFlags; GTFS_RT_FILE="${VALUES_DIR}/gtfs_real_time_values.xml"; if [ -f "${GTFS_RT_FILE}" ]; then RT_PARTS=() + if grep -q "gtfs_real_time_agency_trip_updates_url" "${GTFS_RT_FILE}"; then + if [[ "${F_EXPORT_GTFS_RT_TRIP_UPDATES_PROVIDER}" == "true" ]]; then + RT_PARTS+=(" next departures") + fi + fi if grep -q "gtfs_real_time_agency_service_alerts_url" "${GTFS_RT_FILE}"; then RT_PARTS+=(" service alerts") fi @@ -409,7 +414,7 @@ if [ -f "${GTFS_RT_FILE}" ]; then else PERMISSIONS_LINE="${PERMISSIONS_LINE} and"; fi - PERMISSIONS_LINE="${PERMISSIONS_LINE} real-time service alerts"; + PERMISSIONS_LINE="${PERMISSIONS_LINE} real-time information"; fi if [[ -f "${RSS_FILE}" || -f "${TWITTER_FILE}" || -f "${YOUTUBE_FILE}" ]]; then if [ -z "$PERMISSIONS_LINE" ]; then diff --git a/shared-modules/app-android/src/main/play/listings/en-US/MTshort-description.txt.MT.sh b/shared-modules/app-android/src/main/play/listings/en-US/MTshort-description.txt.MT.sh index 287a7058..3c60d641 100755 --- a/shared-modules/app-android/src/main/play/listings/en-US/MTshort-description.txt.MT.sh +++ b/shared-modules/app-android/src/main/play/listings/en-US/MTshort-description.txt.MT.sh @@ -47,6 +47,12 @@ if [ -z "$AGENCY_NAME_LONG" ]; then 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 + AGENCY_LOCATION_SHORT="" # optional AGENCY_LOCATION_FILE="${CONFIG_DIR}/agency_location"; if [ -f "$AGENCY_LOCATION_FILE" ]; then @@ -57,8 +63,6 @@ if [ -f "$AGENCY_LOCATION_FILE" ]; then fi fi -AGENCY_LABEL=$AGENCY_NAME_LONG; - requireCommand "xmllint" "libxml2-utils"; requireCommand "jq"; @@ -111,12 +115,13 @@ if [ -f "$AGENCY_TYPE_FILE" ]; then fi fi -SHORT_DESC="$AGENCY_NAME_LONG $TYPE_LABEL for MonTransit."; - +AGENCY_LABEL=$AGENCY_NAME_SHORT; if [ -n "$AGENCY_LOCATION_SHORT" ]; then - SHORT_DESC="$AGENCY_LOCATION_SHORT $SHORT_DESC" + AGENCY_LABEL="$AGENCY_LOCATION_SHORT $SHORT_DESC" fi +SHORT_DESC="$AGENCY_LABEL $TYPE_LABEL for MonTransit."; + if [ -f "$BIKE_STATION_VALUES_FILE" ]; then SHORT_DESC="${SHORT_DESC} Availability."; fi @@ -129,6 +134,7 @@ setFeatureFlags; GTFS_RT_FILE="${VALUES_DIR}/gtfs_real_time_values.xml"; if [ -f "${GTFS_RT_FILE}" ]; then + SHORT_DESC="${SHORT_DESC} Real-Time."; if grep -q "gtfs_real_time_agency_service_alerts_url" "${GTFS_RT_FILE}"; then SHORT_DESC="${SHORT_DESC} Alerts."; fi @@ -137,7 +143,13 @@ if [ -f "${GTFS_RT_FILE}" ]; then SHORT_DESC="${SHORT_DESC} Vehicles."; fi fi + if grep -q "gtfs_real_time_agency_trip_updates_url" "${GTFS_RT_FILE}"; then + if [[ "${F_EXPORT_GTFS_RT_TRIP_UPDATES_PROVIDER}" == "true" ]]; then + SHORT_DESC="${SHORT_DESC} Departures."; + fi + fi fi +# TODO: support other real-time providers RSS_FILE="${VALUES_DIR}/rss_values.xml"; TWITTER_FILE="${VALUES_DIR}/twitter_values.xml"; diff --git a/shared-modules/app-android/src/main/play/listings/fr-FR/MTfull-description.txt.MT.sh b/shared-modules/app-android/src/main/play/listings/fr-FR/MTfull-description.txt.MT.sh index 76f93c3e..8b96bc44 100755 --- a/shared-modules/app-android/src/main/play/listings/fr-FR/MTfull-description.txt.MT.sh +++ b/shared-modules/app-android/src/main/play/listings/fr-FR/MTfull-description.txt.MT.sh @@ -44,7 +44,10 @@ if [ ! -d "$CONFIG_DIR" ]; then exit 1; fi -AGENCY_NAME_FILE="${CONFIG_DIR}/agency_name"; +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; @@ -90,7 +93,10 @@ fi GIT_OWNER="mtransitapps"; #TODO extract de GIT_REMOTE_URL=$(git config --get remote.origin.url); # 'git@github.com:owner/repo.git' or 'https://github.com/owner/repo'. CONTACT_WEBSITE_URL="https://github.com/$GIT_OWNER/$PROJECT_NAME"; -SOURCE_URL_FILE="${CONFIG_DIR}/source_url_fr"; +SOURCE_URL_FILE="${CONFIG_DIR}/fr/source_url"; +if [ ! -f "$SOURCE_URL_FILE" ]; then + SOURCE_URL_FILE="${CONFIG_DIR}/source_url_fr"; # Deprecated +fi if [ ! -f "$SOURCE_URL_FILE" ]; then SOURCE_URL_FILE="${CONFIG_DIR}/source_url"; fi @@ -335,6 +341,11 @@ setFeatureFlags; GTFS_RT_FILE="${VALUES_DIR}/gtfs_real_time_values.xml"; if [ -f "${GTFS_RT_FILE}" ]; then RT_PARTS=() + if grep -q "gtfs_real_time_agency_trip_updates_url" "${GTFS_RT_FILE}"; then + if [[ "${F_EXPORT_GTFS_RT_TRIP_UPDATES_PROVIDER}" == "true" ]]; then + RT_PARTS+=(" prochains départs") + fi + fi if grep -q "gtfs_real_time_agency_service_alerts_url" "${GTFS_RT_FILE}"; then RT_PARTS+=(" alertes de service") fi @@ -413,7 +424,7 @@ if [ -f "${GTFS_RT_FILE}" ]; then else PERMISSIONS_LINE="${PERMISSIONS_LINE} et des"; fi - PERMISSIONS_LINE="${PERMISSIONS_LINE} alertes de service en temps-réel"; + PERMISSIONS_LINE="${PERMISSIONS_LINE} information en temps-réel"; fi if [[ -f "${RSS_FILE}" || -f "${TWITTER_FILE}" || -f "${YOUTUBE_FILE}" ]]; then if [ -z "$PERMISSIONS_LINE" ]; then diff --git a/shared-modules/app-android/src/main/play/listings/fr-FR/MTshort-description.txt.MT.sh b/shared-modules/app-android/src/main/play/listings/fr-FR/MTshort-description.txt.MT.sh index fa29f0c9..12ca3bfd 100755 --- a/shared-modules/app-android/src/main/play/listings/fr-FR/MTshort-description.txt.MT.sh +++ b/shared-modules/app-android/src/main/play/listings/fr-FR/MTshort-description.txt.MT.sh @@ -42,7 +42,10 @@ if [ ! -d "$CONFIG_DIR" ]; then exit 1; fi -AGENCY_NAME_FILE="${CONFIG_DIR}/agency_name"; +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; @@ -54,6 +57,12 @@ if [ -z "$AGENCY_NAME_LONG" ]; then 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 + AGENCY_LOCATION_SHORT="" # optional AGENCY_LOCATION_FILE="${CONFIG_DIR}/agency_location"; if [ -f "$AGENCY_LOCATION_FILE" ]; then @@ -64,8 +73,6 @@ if [ -f "$AGENCY_LOCATION_FILE" ]; then fi fi -AGENCY_LABEL=$AGENCY_NAME_LONG; - requireCommand "xmllint" "libxml2-utils"; requireCommand "jq"; @@ -110,7 +117,7 @@ else exit 1 # error fi -AGENCY_LABEL=$AGENCY_NAME_LONG; +AGENCY_LABEL=$AGENCY_NAME_SHORT; if [ -n "$AGENCY_LOCATION_SHORT" ]; then AGENCY_LABEL="$AGENCY_LABEL de $AGENCY_LOCATION_SHORT" fi @@ -129,6 +136,7 @@ setFeatureFlags; GTFS_RT_FILE="${VALUES_DIR}/gtfs_real_time_values.xml"; if [ -f "${GTFS_RT_FILE}" ]; then + SHORT_DESC="${SHORT_DESC} Temps-Réel."; if grep -q "gtfs_real_time_agency_service_alerts_url" "${GTFS_RT_FILE}"; then SHORT_DESC="${SHORT_DESC} Alertes."; fi @@ -137,7 +145,13 @@ if [ -f "${GTFS_RT_FILE}" ]; then SHORT_DESC="${SHORT_DESC} Véhicules."; fi fi + if grep -q "gtfs_real_time_agency_trip_updates_url" "${GTFS_RT_FILE}"; then + if [[ "${F_EXPORT_GTFS_RT_TRIP_UPDATES_PROVIDER}" == "true" ]]; then + SHORT_DESC="${SHORT_DESC} Départs."; + fi + fi fi +# TODO: support other real-time providers RSS_FILE="${VALUES_DIR}/rss_values.xml"; TWITTER_FILE="${VALUES_DIR}/twitter_values.xml"; diff --git a/shared-modules/app-android/src/main/play/listings/fr-FR/MTtitle.txt.MT.sh b/shared-modules/app-android/src/main/play/listings/fr-FR/MTtitle.txt.MT.sh index 0c603557..ca070eaf 100755 --- a/shared-modules/app-android/src/main/play/listings/fr-FR/MTtitle.txt.MT.sh +++ b/shared-modules/app-android/src/main/play/listings/fr-FR/MTtitle.txt.MT.sh @@ -41,7 +41,10 @@ if [ ! -d "$CONFIG_DIR" ]; then exit 1; fi -AGENCY_NAME_FILE="${CONFIG_DIR}/agency_name"; +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; diff --git a/shared-modules/app-android/src/main/res/values-fr/MTbike_station_strings.xml.MT.sh b/shared-modules/app-android/src/main/res/values-fr/MTbike_station_strings.xml.MT.sh index d69451fb..d04ed189 100755 --- a/shared-modules/app-android/src/main/res/values-fr/MTbike_station_strings.xml.MT.sh +++ b/shared-modules/app-android/src/main/res/values-fr/MTbike_station_strings.xml.MT.sh @@ -48,7 +48,10 @@ if [ ! -d "$CONFIG_DIR" ]; then exit 1; fi -AGENCY_NAME_FILE="${CONFIG_DIR}/agency_name"; +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; diff --git a/shared-modules/app-android/src/main/res/values-fr/MTstrings.xml.MT.sh b/shared-modules/app-android/src/main/res/values-fr/MTstrings.xml.MT.sh index f5d0a172..0715bdfd 100755 --- a/shared-modules/app-android/src/main/res/values-fr/MTstrings.xml.MT.sh +++ b/shared-modules/app-android/src/main/res/values-fr/MTstrings.xml.MT.sh @@ -42,7 +42,10 @@ if [ ! -d "$CONFIG_DIR" ]; then exit 1; fi -AGENCY_NAME_FILE="${CONFIG_DIR}/agency_name"; +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; @@ -93,7 +96,7 @@ elif [ "$TYPE" -eq 1 ]; then # SUBWAY elif [ "$TYPE" -eq 2 ]; then # TRAIN TYPE_LABEL="trains"; elif [ "$TYPE" -eq 3 ]; then # BUS - TYPE_LABEL="bus"; + TYPE_LABEL="autobus"; elif [ "$TYPE" -eq 4 ]; then # FERRY TYPE_LABEL="bateaux"; elif [ "$TYPE" -eq 100 ]; then # BIKE @@ -144,8 +147,8 @@ cat >>"${STRINGS_FILE}" < - MonTransit $AGENCY_NAME_LONG $TYPE_LABEL ($LOCATION_LABEL) - Données des $TYPE_LABEL de $AGENCY_NAME_LONG à $LOCATION_LABEL pour MonTransit. + MonTransit $AGENCY_NAME_SHORT $TYPE_LABEL ($LOCATION_LABEL) + Données des $TYPE_LABEL de $AGENCY_NAME_LONG ($LOCATION_LABEL) pour MonTransit. EOL diff --git a/shared-modules/app-android/src/main/res/values/MTstrings.xml.MT.sh b/shared-modules/app-android/src/main/res/values/MTstrings.xml.MT.sh index db4788c3..5925acc0 100755 --- a/shared-modules/app-android/src/main/res/values/MTstrings.xml.MT.sh +++ b/shared-modules/app-android/src/main/res/values/MTstrings.xml.MT.sh @@ -144,7 +144,7 @@ cat >>"${STRINGS_FILE}" < - MonTransit $AGENCY_NAME_LONG $TYPE_LABEL ($LOCATION_LABEL) + MonTransit $AGENCY_NAME_SHORT $TYPE_LABEL ($LOCATION_LABEL) $LOCATION_LABEL $AGENCY_NAME_LONG $TYPE_LABEL data for MonTransit. EOL diff --git a/shared/.idea/codeStyles/Project.xml b/shared/.idea/codeStyles/Project.xml index 51722edf..bcbfdfc1 100644 --- a/shared/.idea/codeStyles/Project.xml +++ b/shared/.idea/codeStyles/Project.xml @@ -55,6 +55,11 @@