update translate

Author: inoribea

astroquery_cli/locales/fr/LC_MESSAGES/messages.mo

@@ -75,27 +75,27 @@ def setup_subcommands():
     # Restore astroquery log level after import
     logging.getLogger('astroquery').setLevel(logging.NOTSET)
 
-    app.add_typer(alma_cli.get_app(), name="alma")
-    app.add_typer(esasky_cli.get_app(), name="esasky")
-    app.add_typer(gaia_cli.get_app(), name="gaia")
-    app.add_typer(irsa_cli.get_app(), name="irsa")
-    app.add_typer(jpl_cli.get_app(), name="jpl") # Updated for jpl
     app.add_typer(mast_cli.get_app(), name="mast")
-    app.add_typer(ads_cli.get_app(), name="ads")
-    app.add_typer(ned_cli.get_app(), name="ned")
-    app.add_typer(simbad_cli.get_app(), name="simbad", help=builtins._("Query the SIMBAD astronomical database. (sim)"))
-    app.add_typer(simbad_cli.get_app(), name="sim") # Alias for simbad
-    app.add_typer(splatalogue_cli.get_app(), name="splatalogue", help=builtins._("Query the Splatalogue spectral line database. (spl)"))
-    app.add_typer(splatalogue_cli.get_app(), name="spl") # Alias for splatalogue
     app.add_typer(vizier_cli.get_app(), name="vizier", help=builtins._("Query the VizieR astronomical catalog database. (viz)"))
     app.add_typer(vizier_cli.get_app(), name="viz") # Alias for vizier
+    app.add_typer(simbad_cli.get_app(), name="simbad", help=builtins._("Query the SIMBAD astronomical database. (sim)"))
+    app.add_typer(simbad_cli.get_app(), name="sim") # Alias for simbad
+    app.add_typer(jpl_cli.get_app(), name="jpl") # Updated for jpl
+    app.add_typer(exoplanet_cli.get_app(), name="exoplanet", help=builtins._("Query the NASA Exoplanet Archive. (exo)"))
+    app.add_typer(exoplanet_cli.get_app(), name="exo") # Alias for exoplanet
     app.add_typer(heasarc_cli.get_app(), name="heasarc", help=builtins._("Query the HEASARC database. (hea)"))
     app.add_typer(heasarc_cli.get_app(), name="hea") # Alias for heasarc
-    app.add_typer(sdss_cli.get_app(), name="sdss")
+    app.add_typer(gaia_cli.get_app(), name="gaia")
+    app.add_typer(alma_cli.get_app(), name="alma")
+    app.add_typer(irsa_cli.get_app(), name="irsa")
+    app.add_typer(sdss_cli.get_app(builtins._), name="sdss")
+    app.add_typer(ned_cli.get_app(), name="ned")
     app.add_typer(eso_cli.get_app(), name="eso")
-    app.add_typer(nist_cli.get_app(), name="nist")
-    app.add_typer(exoplanet_cli.get_app(), name="exoplanet", help=builtins._("Query the NASA Exoplanet Archive. (exo)"))
-    app.add_typer(exoplanet_cli.get_app(), name="exo") # Alias for exoplanet
+    app.add_typer(esasky_cli.get_app(), name="esasky")
+    app.add_typer(nist_cli.get_app(builtins._), name="nist")
+    app.add_typer(splatalogue_cli.get_app(), name="splatalogue", help=builtins._("Query the Splatalogue spectral line database. (spl)"))
+    app.add_typer(splatalogue_cli.get_app(), name="spl") # Alias for splatalogue
+    app.add_typer(ads_cli.get_app(), name="ads")
 
 @app.callback()
 def main_callback(

astroquery_cli/locales/ja/LC_MESSAGES/messages.mo

@@ -18,12 +18,10 @@
 from astroquery_cli.common_options import setup_debug_context
 from astroquery_cli.debug import debug
 
-def get_app():
-    import builtins
-    _ = builtins._
+def get_app(_: callable):
     app = typer.Typer(
         name="nist",
-        help=builtins._("Query the NIST Atomic Spectra Database."),
+        help=_("Query the NIST Atomic Spectra Database."),
         invoke_without_command=True,
         no_args_is_help=False
     )
@@ -34,43 +32,43 @@ def nist_callback(
         ctx: typer.Context,
         query_string: Optional[str] = typer.Argument(
             None,
-            help=builtins._("Primary query input: wavelength range (e.g., '2000 3000') or line name (e.g., 'Fe II').")
+            help=_("Primary query input: wavelength range (e.g., '2000 3000') or line name (e.g., 'Fe II').")
         ),
         minwav: Optional[float] = typer.Option(
             None,
-            help=builtins._("Explicit minimum wavelength (e.g., 2000). Overrides any wavelength range parsed from 'query_string'. "
+            help=_("Explicit minimum wavelength (e.g., 2000). Overrides any wavelength range parsed from 'query_string'. "
                 "Can be combined with '--linename'.")
         ),
         maxwav: Optional[float] = typer.Option(
             None,
-            help=builtins._("Explicit maximum wavelength (e.g., 3000). Overrides any wavelength range parsed from 'query_string'. "
+            help=_("Explicit maximum wavelength (e.g., 3000). Overrides any wavelength range parsed from 'query_string'. "
                 "Can be combined with '--linename'.")
         ),
         linename: Optional[str] = typer.Option(
             None,
-            help=builtins._("Explicit line name (e.g., 'Fe II', 'H I'). Overrides any line name parsed from 'query_string'. "
+            help=_("Explicit line name (e.g., 'Fe II', 'H I'). Overrides any line name parsed from 'query_string'. "
                 "Can be combined with explicit '--minwav' and '--maxwav' for a specific range.")
         ),
         output_file: Optional[str] = common_output_options["output_file"],
         output_format: Optional[str] = common_output_options["output_format"],
         max_rows_display: int = typer.Option(
-            25, help=builtins._("Maximum number of rows to display. Use -1 for all rows.")
+            25, help=_("Maximum number of rows to display. Use -1 for all rows.")
         ),
         show_all_columns: bool = typer.Option(
-            False, "--show-all-cols", help=builtins._("Show all columns in the output table.")
+            False, "--show-all-cols", help=_("Show all columns in the output table.")
         ),
-        test: bool = typer.Option(False, "--test", "-t", help=builtins._("Enable test mode and print elapsed time.")),
+        test: bool = typer.Option(False, "--test", "-t", help=_("Enable test mode and print elapsed time.")),
         debug_flag: bool = typer.Option( # Renamed to avoid conflict with imported debug
             False,
             "--debug", # Removed -t to avoid conflict with --test
-            help=builtins._("Enable debug mode with verbose output."),
+            help=_("Enable debug mode with verbose output."),
             envvar="AQC_DEBUG"
         ),
         verbose: bool = typer.Option(
             False,
             "-v",
             "--verbose",
-            help=builtins._("Enable verbose output.")
+            help=_("Enable verbose output.")
         )
     ):
         setup_debug_context(ctx, debug_flag, verbose)

astroquery_cli/locales/zh/LC_MESSAGES/messages.mo

@@ -18,23 +18,21 @@
 from astroquery_cli.common_options import setup_debug_context
 from astroquery_cli.debug import debug
 
-def get_app():
-    import builtins
-    _ = builtins._
+def get_app(_: callable):
     app = typer.Typer(
         name="sdss",
-        help=builtins._(
-            "Query the Sloan Digital Sky Survey database.\n\n"
-            "Perform a query on SDSS. You must provide parameters for exactly one of the following query types:\n\n"
-            "  1. Cone Search:\n"
-            "     --ra <RA> --dec <DEC> --radius <RADIUS>\n"
-            "     (e.g., --ra '10.5 deg' --dec '20.1 deg' --radius '2 arcmin')\n\n"
-            "  2. Spectroscopic Object ID Search:\n"
-            "     --specobjid <ID> [--objtype <TYPE>]\n"
-            "     (e.g., --specobjid 2634622337315530752 --objtype 'GALAXY')\n\n"
-            "  3. Fiber ID Search:\n"
-            "     --plate <PLATE> --mjd <MJD> --fiberid <FIBERID> [--objtype <TYPE>]\n"
-            "     (e.g., --plate 123 --mjd 51608 --fiberid 1)"
+        help=(
+            _("Query the Sloan Digital Sky Survey database.") + "\n\n" +
+            _("Perform a query on SDSS. You must provide parameters for exactly one of the following query types:") + "\n\n" +
+            _("  1. Cone Search:") + "\n" +
+            _("     --ra <RA> --dec <DEC> --radius <RADIUS>") + "\n" +
+            _("     (e.g., --ra '10.5 deg' --dec '20.1 deg' --radius '2 arcmin')") + "\n\n" +
+            _("  2. Spectroscopic Object ID Search:") + "\n" +
+            _("     --specobjid <ID> [--objtype <TYPE>]") + "\n" +
+            _("     (e.g., --specobjid 2634622337315530752 --objtype 'GALAXY')") + "\n\n" +
+            _("  3. Fiber ID Search:") + "\n" +
+            _("     --plate <PLATE> --mjd <MJD> --fiberid <FIBERID> [--objtype <TYPE>]") + "\n" +
+            _("     (e.g., --plate 123 --mjd 51608 --fiberid 1)")
         ),
         invoke_without_command=True,
         no_args_is_help=False
@@ -48,30 +46,30 @@ def sdss_callback(
             False,
             "-t",
             "--debug",
-            help=builtins._("Enable debug mode with verbose output."),
+            help=_("Enable debug mode with verbose output."),
             envvar="AQC_DEBUG"
         ),
         verbose: bool = typer.Option(
             False,
             "-v",
             "--verbose",
-            help=builtins._("Enable verbose output.")
+            help=_("Enable verbose output.")
         ),
-        ra: Optional[str] = typer.Option(None, help=builtins._("Right Ascension (e.g., '10.5 deg', '0h42m30s'). Required for cone search.")),
-        dec: Optional[str] = typer.Option(None, help=builtins._("Declination (e.g., '20.1 deg', '+41d12m0s'). Required for cone search.")),
-        radius: Optional[str] = typer.Option(None, help=builtins._("Search radius (e.g., '0.5 deg', '2 arcmin'). Max 3 arcmin. Required for cone search.")),
-        objtype: Optional[str] = typer.Option(None, help=builtins._("Object type (e.g., 'STAR', 'GALAXY', 'QSO'). Note: This parameter is only applicable for queries using specobjid or plate/mjd/fiberid, not for cone searches.")),
-        specobjid: Optional[int] = typer.Option(None, help=builtins._("Spectroscopic object ID. Required for specobjid search.")),
-        plate: Optional[int] = typer.Option(None, help=builtins._("Plate number for spectroscopic data. Required for fiber ID search.")),
-        mjd: Optional[int] = typer.Option(None, help=builtins._("Modified Julian Date for spectroscopic data. Required for fiber ID search.")),
-        fiberid: Optional[int] = typer.Option(None, help=builtins._("Fiber ID for spectroscopic data. Required for fiber ID search.")),
+        ra: Optional[str] = typer.Option(None, help=_("Right Ascension (e.g., '10.5 deg', '0h42m30s'). Required for cone search.")),
+        dec: Optional[str] = typer.Option(None, help=_("Declination (e.g., '20.1 deg', '+41d12m0s'). Required for cone search.")),
+        radius: Optional[str] = typer.Option(None, help=_("Search radius (e.g., '0.5 deg', '2 arcmin'). Max 3 arcmin. Required for cone search.")),
+        objtype: Optional[str] = typer.Option(None, help=_("Object type (e.g., 'STAR', 'GALAXY', 'QSO'). Note: This parameter is only applicable for queries using specobjid or plate/mjd/fiberid, not for cone searches.")),
+        specobjid: Optional[int] = typer.Option(None, help=_("Spectroscopic object ID. Required for specobjid search.")),
+        plate: Optional[int] = typer.Option(None, help=_("Plate number for spectroscopic data. Required for fiber ID search.")),
+        mjd: Optional[int] = typer.Option(None, help=_("Modified Julian Date for spectroscopic data. Required for fiber ID search.")),
+        fiberid: Optional[int] = typer.Option(None, help=_("Fiber ID for spectroscopic data. Required for fiber ID search.")),
         output_file: Optional[str] = common_output_options["output_file"],
         output_format: Optional[str] = common_output_options["output_format"],
         max_rows_display: int = typer.Option(
-            25, help=builtins._("Maximum number of rows to display. Use -1 for all rows.")
+            25, help=_("Maximum number of rows to display. Use -1 for all rows.")
         ),
         show_all_columns: bool = typer.Option(
-            False, "--show-all-cols", help=builtins._("Show all columns in the output table.")
+            False, "--show-all-cols", help=_("Show all columns in the output table.")
         ),
     ):
         setup_debug_context(ctx, debug, verbose)

astroquery_cli/main.py

@@ -0,0 +1,73 @@
+import polib
+import os
+import sys
+
+def backfill_translated(po_file_path, untranslated_tmp_path):
+    """
+    Backfills translations from a .tmp file into a .po file using polib.
+    Also clears fuzzy flags for updated entries.
+    """
+    try:
+        po = polib.pofile(po_file_path)
+    except Exception as e:
+        print(f"Error reading PO file {po_file_path}: {e}", file=sys.stderr)
+        return
+
+    # Read translations from the .tmp file
+    translations = {}
+    try:
+        with open(untranslated_tmp_path, 'r', encoding='utf-8') as f:
+            for line in f:
+                # Do not strip the entire line, as msgid might have leading/trailing whitespace or newlines
+                if line.startswith('/') or not line.strip(): # Skip comments and empty lines
+                    continue
+                parts = line.split('|||', 1)
+                if len(parts) == 2:
+                    msgid = parts[0]
+                    msgstr = parts[1].strip()
+                    translations[msgid] = msgstr
+    except Exception as e:
+        print(f"Error reading untranslated .tmp file {untranslated_tmp_path}: {e}", file=sys.stderr)
+        return
+
+    updated_count = 0
+    for entry in po:
+        # Normalize the msgid from the .po file for comparison
+        # Remove leading newline if it's a multi-line string starting with ""\n"..."
+        normalized_po_msgid = entry.msgid
+        if normalized_po_msgid.startswith('\n') and len(normalized_po_msgid) > 1 and normalized_po_msgid[1] != '\n':
+            normalized_po_msgid = normalized_po_msgid[1:]
+
+        if not entry.obsolete:
+            if normalized_po_msgid in translations:
+                new_msgstr = translations[normalized_po_msgid]
+                if entry.msgstr != new_msgstr:
+                    entry.msgstr = new_msgstr
+                    # Clear fuzzy flag if it was updated
+                    if 'fuzzy' in entry.flags:
+                        entry.flags.remove('fuzzy')
+                    updated_count += 1
+                elif 'fuzzy' in entry.flags:
+                    # If msgstr is already correct but still fuzzy, clear fuzzy flag
+                    entry.flags.remove('fuzzy')
+                    updated_count += 1
+
+
+    if updated_count > 0:
+        try:
+            po.save()
+            print(f"Updated {updated_count} entries in {po_file_path}")
+        except Exception as e:
+            print(f"Error saving PO file {po_file_path}: {e}", file=sys.stderr)
+    else:
+        print(f"No updates needed for {po_file_path}")
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 3:
+        print("Usage: python backfill_translated.py <po_file_path> <untranslated_tmp_path>", file=sys.stderr)
+        sys.exit(1)
+
+    po_file = sys.argv[1]
+    untranslated_tmp_file = sys.argv[2]
+    backfill_translated(po_file, untranslated_tmp_file)

astroquery_cli/modules/nist_cli.py

@@ -4,6 +4,11 @@ set -e
 LOCALES_DIR="$(dirname "$0")"
 DOMAIN="messages"
 
+# First, extract all untranslated entries into .tmp files
+echo "Extracting latest untranslated entries into .tmp files..."
+sh "$LOCALES_DIR/extract-untranslated.sh"
+echo "Finished extracting untranslated entries."
+
 for tmp in "$LOCALES_DIR"/untranslated_*.tmp; do
     [ -f "$tmp" ] || continue
     lang=$(echo "$tmp" | sed -E 's/.*untranslated_([^.]+)\.tmp/\1/')
@@ -15,110 +20,7 @@ for tmp in "$LOCALES_DIR"/untranslated_*.tmp; do
 
     cp "$po" "$po.bak"
 
-    awk -v TMP="$tmp" '
-        function trim(s) { sub(/^[ \t\r\n]+/, "", s); sub(/[ \t\r\n]+$/, "", s); return s }
-        function extract_vars(str, arr,    n, i, m) {
-            n = split(str, arr, /\{[a-zA-Z0-9_]+\}/)
-            m = match(str, /\{[a-zA-Z0-9_]+\}/)
-            delete arr
-            i = 0
-            while (match(str, /\{[a-zA-Z0-9_]+\}/)) {
-                arr[++i] = substr(str, RSTART, RLENGTH)
-                str = substr(str, RSTART + RLENGTH)
-            }
-            return i
-        }
-        function sync_vars(msgid, msgstr,    vars_id, vars_str, i, j, out, p) {
-            split("", vars_id)
-            split("", vars_str)
-            extract_vars(msgid, vars_id)
-            extract_vars(msgstr, vars_str)
-            out = msgstr
-            if (length(vars_id) > 0 && length(vars_str) == 0) {
-                sub(/"$/, " " vars_id[1] "\"", out)
-                for (i=2; i<=length(vars_id); i++) out = substr(out,1,length(out)-2) " " vars_id[i] "\"\n"
-                return out
-            }
-            if (length(vars_id) > 0) {
-                j = 1
-                out = msgstr
-                while (match(out, /\{[a-zA-Z0-9_]+\}/)) {
-                    if (j <= length(vars_id)) {
-                        out = substr(out,1,RSTART-1) vars_id[j] substr(out,RSTART+RLENGTH)
-                    } else {
-                        out = substr(out,1,RSTART-1) substr(out,RSTART+RLENGTH)
-                    }
-                    j++
-                }
-                for (p=j; p<=length(vars_id); p++) {
-                    sub(/"$/, " " vars_id[p] "\"", out)
-                }
-                return out
-            }
-            gsub(/\{[a-zA-Z0-9_]+\}/, "", out)
-            return out
-        }
-        BEGIN {
-            while ((getline < TMP) > 0) {
-                if ($0 ~ /^\//) continue
-                split($0, arr, /\|\|\|/)
-                key = trim(arr[1])
-                val = trim(arr[2])
-                untranslated[key] = val
-            }
-            close(TMP)
-            msgid = ""; msgstr = ""; inmsgid = 0; inmsgstr = 0; lines = ""
-        }
-        /^msgid / {
-            inmsgid = 1; inmsgstr = 0
-            msgid = substr($0,8,length($0)-8)
-            lines = $0 "\n"
-            next
-        }
-        /^msgstr / {
-            inmsgid = 0; inmsgstr = 1
-            msgstr = substr($0,9,length($0)-9)
-            if (msgid in untranslated && untranslated[msgid] != "") {
-                n = split(untranslated[msgid], arr, /\n/)
-                if (n == 1) {
-                    fixed = sync_vars(msgid, "msgstr \"" arr[1] "\"\n")
-                    lines = lines fixed
-                } else {
-                    lines = lines "msgstr \"\"\n"
-                    for (i = 1; i <= n; i++) {
-                        if (arr[i] != "") {
-                            fixed = sync_vars(msgid, "\"" arr[i] "\"\n")
-                            lines = lines fixed
-                        }
-                    }
-                }
-            } else {
-                lines = lines $0 "\n"
-            }
-            print lines
-            msgid = ""; msgstr = ""; lines = ""
-            next
-        }
-        /^"/ {
-            if (inmsgid) {
-                msgid = msgid substr($0,2,length($0)-2)
-            }
-            if (inmsgstr) {
-                msgstr = msgstr substr($0,2,length($0)-2)
-            }
-            lines = lines $0 "\n"
-            next
-        }
-        {
-            lines = lines $0 "\n"
-            if ($0 == "") {
-                print lines
-                msgid = ""; msgstr = ""; inmsgid = 0; inmsgstr = 0; lines = ""
-            }
-        }
-    ' "$po.bak" > "$po"
-
-    msgattrib --clear-fuzzy "$po" -o "$po"
+    poetry run python "$LOCALES_DIR/backfill_translated.py" "$po" "$tmp"
     echo "Updated: $po"
 done