Skip to content

Support for agency_owner file and improve fr files #594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmathieum merged 3 commits into from
Feb 26, 2026
+84 −53
Merged

Support for agency_owner file and improve fr files #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21ea15f
Support for `agency_owner` file and improve `fr` files
mmathieum Feb 26, 2026
83f2480
PR comments
mmathieum Feb 26, 2026
1b31e7f
PR comments
mmathieum Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions shared-modules/app-android/src/main/play/listings/en-US/MTfull-description.txt.MT.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,11 @@ if [ -f "$SOURCE_NAME_FILE" ]; then
SOURCE_NAME=$(head -n 1 $SOURCE_NAME_FILE);
fi

AGENCY_OWNER_FILE="${CONFIG_DIR}/agency_owner"; #optional
if [ -f "$AGENCY_OWNER_FILE" ]; then
AGENCY_OWNER_LONG=$(tail -n 1 $AGENCY_OWNER_FILE);
fi

CITIES_FILE="${CONFIG_DIR}/cities";
if [ ! -f "$CITIES_FILE" ]; then
echo "$CITIES_FILE doesn't exist!";
Expand Down Expand Up @@ -144,6 +149,22 @@ fi

INDEX=1;
NOT_RELATED_WITH="";
if [ -n "$SOURCE_NAME" ]; then
if [ "${INDEX}" -eq 1 ]; then
NOT_RELATED_WITH="$SOURCE_NAME";
else
NOT_RELATED_WITH+=" or $SOURCE_NAME";
fi
((INDEX++))
fi
if [ -n "$AGENCY_OWNER_LONG" ]; then
if [ "${INDEX}" -eq 1 ]; then
NOT_RELATED_WITH="$AGENCY_OWNER_LONG";
else
NOT_RELATED_WITH+=" or $AGENCY_OWNER_LONG";
fi
((INDEX++))
fi
if [ -n "$AGENCY_NAME_LONG" ]; then
if [ "${INDEX}" -eq 1 ]; then
NOT_RELATED_WITH="$AGENCY_NAME_LONG";
Expand All @@ -160,14 +181,6 @@ if [ -n "$PARENT_AGENCY_NAME_LONG" ]; then
fi
((INDEX++))
fi
if [ -n "$SOURCE_NAME" ]; then
if [ "${INDEX}" -eq 1 ]; then
NOT_RELATED_WITH="$SOURCE_NAME";
else
NOT_RELATED_WITH+=" or $SOURCE_NAME";
fi
((INDEX++))
fi

requireCommand "xmllint" "libxml2-utils";
requireCommand "jq";
Expand Down
50 changes: 32 additions & 18 deletions shared-modules/app-android/src/main/play/listings/fr-FR/MTfull-description.txt.MT.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ setGitProjectName;

setIsCI;

LANG_FR_FILE="${ROOT_DIR}/config/lang/fr";
if [ ! -f "$LANG_FR_FILE" ]; then
echo ">> Generating fr-FR/full-description.txt... SKIP (FR lang not supported)";
exit 0; # ok
fi

echo ">> Generating fr-FR/full-description.txt...";

APP_ANDROID_DIR="${ROOT_DIR}/app-android";
Expand All @@ -24,6 +18,13 @@ MAIN_DIR="${SRC_DIR}/main";
PLAY_DIR="${MAIN_DIR}/play";
LISTINGS_DIR="${PLAY_DIR}/listings";
FR_FR_DIR="${LISTINGS_DIR}/fr-FR";

LANG_FR_FILE="${ROOT_DIR}/config/lang/fr";
if [[ ! -f "$LANG_FR_FILE" && ! -d "$FR_FR_DIR" ]]; then
echo ">> Generating fr-FR/full-description.txt... SKIP (FR lang not supported)";
exit 0; # ok
fi

FULL_DESCRIPTION_FILE="${FR_FR_DIR}/full-description.txt";
mkdir -p "${FR_FR_DIR}";
checkResult $?;
Expand Down Expand Up @@ -108,6 +109,11 @@ if [ -f "$SOURCE_NAME_FILE" ]; then
SOURCE_NAME=$(head -n 1 $SOURCE_NAME_FILE);
fi

AGENCY_OWNER_FILE="${CONFIG_DIR}/agency_owner"; #optional
if [ -f "$AGENCY_OWNER_FILE" ]; then
AGENCY_OWNER_LONG=$(tail -n 1 $AGENCY_OWNER_FILE);
fi

CITIES_FILE="${CONFIG_DIR}/cities";
if [ ! -f "$CITIES_FILE" ]; then
echo "$CITIES_FILE doesn't exist!";
Expand Down Expand Up @@ -137,11 +143,11 @@ else
exit 1 # error
fi

LOCATION_LABEL="$CITIES_LABEL au";
LOCATION_LABEL="$CITIES_LABEL (";
if [ -n "$STATE_LABEL_LONG" ]; then
LOCATION_LABEL="$LOCATION_LABEL $STATE_LABEL_LONG,";
LOCATION_LABEL="$LOCATION_LABEL$STATE_LABEL_LONG, ";
fi
LOCATION_LABEL="$LOCATION_LABEL $COUNTRY_LABEL";
LOCATION_LABEL="$LOCATION_LABEL$COUNTRY_LABEL)";

SOURCE_PROVIDER="$SOURCE_NAME";
if [ -z "$SOURCE_PROVIDER" ]; then
Expand All @@ -153,6 +159,22 @@ fi

INDEX=1;
NOT_RELATED_WITH="";
if [ -n "$SOURCE_NAME" ]; then
if [ "${INDEX}" -eq 1 ]; then
NOT_RELATED_WITH="$SOURCE_NAME";
else
NOT_RELATED_WITH+=" ou $SOURCE_NAME";
fi
((INDEX++))
fi
if [ -n "$AGENCY_OWNER_LONG" ]; then
if [ "${INDEX}" -eq 1 ]; then
NOT_RELATED_WITH="$AGENCY_OWNER_LONG";
else
NOT_RELATED_WITH+=" ou $AGENCY_OWNER_LONG";
fi
((INDEX++))
fi
if [ -n "$AGENCY_NAME_LONG" ]; then
if [ "${INDEX}" -eq 1 ]; then
NOT_RELATED_WITH="$AGENCY_NAME_LONG";
Expand All @@ -169,14 +191,6 @@ if [ -n "$PARENT_AGENCY_NAME_LONG" ]; then
fi
((INDEX++))
fi
if [ -n "$SOURCE_NAME" ]; then
if [ "${INDEX}" -eq 1 ]; then
NOT_RELATED_WITH="$SOURCE_NAME";
else
NOT_RELATED_WITH+=" ou $SOURCE_NAME";
fi
((INDEX++))
fi

requireCommand "xmllint" "libxml2-utils";
requireCommand "jq";
Expand Down Expand Up @@ -212,7 +226,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"; # "bus"
elif [ "$TYPE" -eq 4 ]; then # FERRY
TYPE_LABEL="bateaux";
elif [ "$TYPE" -eq 100 ]; then # BIKE
Expand Down
13 changes: 7 additions & 6 deletions shared-modules/app-android/src/main/play/listings/fr-FR/MTshort-description.txt.MT.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ source ${COMMONS_DIR}/feature_flags.sh;

setIsCI;

LANG_FR_FILE="${ROOT_DIR}/config/lang/fr";
if [ ! -f "$LANG_FR_FILE" ]; then
echo ">> Generating fr-FR/short-description.txt... SKIP (FR lang not supported)";
exit 0; # ok
fi

echo ">> Generating fr-FR/short-description.txt...";

APP_ANDROID_DIR="${ROOT_DIR}/app-android";
Expand All @@ -22,6 +16,13 @@ MAIN_DIR="${SRC_DIR}/main";
PLAY_DIR="${MAIN_DIR}/play";
LISTINGS_DIR="${PLAY_DIR}/listings";
FR_FR_DIR="${LISTINGS_DIR}/fr-FR";

LANG_FR_FILE="${ROOT_DIR}/config/lang/fr";
if [[ ! -f "$LANG_FR_FILE" && ! -d "$FR_FR_DIR" ]]; then
echo ">> Generating fr-FR/short-description.txt... SKIP (FR lang not supported)";
exit 0; # ok
fi

SHORT_DESCRIPTION_FILE="${FR_FR_DIR}/short-description.txt";
mkdir -p "${FR_FR_DIR}";
checkResult $?;
Expand Down
13 changes: 7 additions & 6 deletions shared-modules/app-android/src/main/play/listings/fr-FR/MTtitle.txt.MT.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ source ${COMMONS_DIR}/commons.sh;

setIsCI;

LANG_FR_FILE="${ROOT_DIR}/config/lang/fr";
if [ ! -f "$LANG_FR_FILE" ]; then
echo ">> Generating fr-FR/title.txt... SKIP (FR lang not supported)";
exit 0; # ok
fi

echo ">> Generating fr-FR/title.txt...";

APP_ANDROID_DIR="${ROOT_DIR}/app-android";
Expand All @@ -21,6 +15,13 @@ MAIN_DIR="${SRC_DIR}/main";
PLAY_DIR="${MAIN_DIR}/play";
LISTINGS_DIR="${PLAY_DIR}/listings";
FR_FR_DIR="${LISTINGS_DIR}/fr-FR";

LANG_FR_FILE="${ROOT_DIR}/config/lang/fr";
if [[ ! -f "$LANG_FR_FILE" && ! -d "$FR_FR_DIR" ]]; then
echo ">> Generating fr-FR/title.txt... SKIP (FR lang not supported)";
exit 0; # ok
fi

TITLE_FILE="${FR_FR_DIR}/title.txt";
mkdir -p "${FR_FR_DIR}";
checkResult $?;
Expand Down
19 changes: 10 additions & 9 deletions shared-modules/app-android/src/main/res/values-fr/MTbike_station_strings.xml.MT.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,17 @@ 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";
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" ]; then
echo ">> Generating values-fr/strings.xml... SKIP (FR lang not supported)";
if [[ ! -f "$LANG_FR_FILE" && ! -d "$VALUES_FR_DIR" ]]; then
echo ">> Generating values-fr/bike_station_strings.xml... SKIP (FR lang not supported)";
exit 0; # ok
fi

Expand All @@ -21,13 +29,6 @@ if [ ! -f "${BIKE_STATION_VALUES_FILE}" ]; then
exit 0; # ok
fi

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";
RES_DIR="${MAIN_DIR}/res";
VALUES_FR_DIR="${RES_DIR}/values-fr";
BIKE_STATION_STRINGS_FILE="${VALUES_FR_DIR}/bike_station_strings.xml";
mkdir -p "${VALUES_FR_DIR}";
checkResult $?;
Expand Down
13 changes: 7 additions & 6 deletions shared-modules/app-android/src/main/res/values-fr/MTstrings.xml.MT.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,20 @@ setGitProjectName;

setIsCI;

LANG_FR_FILE="${ROOT_DIR}/config/lang/fr";
if [ ! -f "$LANG_FR_FILE" ]; then
echo ">> Generating values-fr/strings.xml... SKIP (FR lang not supported)";
exit 0; # ok
fi

echo ">> Generating values-fr/strings.xml...";

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/strings.xml... SKIP (FR lang not supported)";
exit 0; # ok
fi

STRINGS_FILE="${VALUES_FR_DIR}/strings.xml";
mkdir -p "${VALUES_FR_DIR}";
checkResult $?;
Expand Down