The Unified and Autonomous Development Platform
feat: Display ellapsed time / estimated remaining time when hover mouse over build progress bar
Robin Shen35b5e6804fc7
diff --git a/server-core/src/main/java/io/onedev/server/web/component/progress/TimeProgressBar.java b/server-core/src/main/java/io/onedev/server/web/component/progress/TimeProgressBar.javaindex 826f964240..10f53a2c47 100644--- a/server-core/src/main/java/io/onedev/server/web/component/progress/TimeProgressBar.java+++ b/server-core/src/main/java/io/onedev/server/web/component/progress/TimeProgressBar.java@@ -51,6 +51,11 @@ public class TimeProgressBar extends Panel {tag.put("aria-label", _T("Estimated progress"));tag.put("data-estimated-duration", String.valueOf(estimatedDuration));tag.put("data-elapsed", String.valueOf(elapsed));+ tag.put("data-elapsed-template", _T("Elapsed time: {0}"));+ tag.put("data-remaining-template", _T("Estimated remaining time: {0}"));+ tag.put("data-hours-template", _T("{0}h {1}m {2}s"));+ tag.put("data-minutes-template", _T("{0}m {1}s"));+ tag.put("data-seconds-template", _T("{0}s"));if (estimatedDuration <= 0)tag.put("hidden", "hidden");}diff --git a/server-core/src/main/java/io/onedev/server/web/component/progress/time-progress.css b/server-core/src/main/java/io/onedev/server/web/component/progress/time-progress.cssindex 191f16f8ba..0e7d348268 100644--- a/server-core/src/main/java/io/onedev/server/web/component/progress/time-progress.css+++ b/server-core/src/main/java/io/onedev/server/web/component/progress/time-progress.css@@ -1,5 +1,5 @@.time-progress {- height: 4px;+ height: 6px;flex-shrink: 0;overflow: hidden;border-radius: 0;diff --git a/server-core/src/main/java/io/onedev/server/web/component/progress/time-progress.js b/server-core/src/main/java/io/onedev/server/web/component/progress/time-progress.jsindex e57263ad6e..3753369326 100644--- a/server-core/src/main/java/io/onedev/server/web/component/progress/time-progress.js+++ b/server-core/src/main/java/io/onedev/server/web/component/progress/time-progress.js@@ -13,11 +13,15 @@ onedev.server.timeProgress = {const state = {elapsed: Math.max(0, elapsed), estimatedDuration: estimatedDuration, updated: performance.now()};element.timeProgress = state;element.hidden = !Number.isFinite(estimatedDuration) || estimatedDuration <= 0;- if (element.hidden) return;+ if (element.hidden) {+ if (element._tippy) element._tippy.hide();+ return;+ }this.render(element);state.timer = setInterval(() => {if (!element.isConnected) {clearInterval(state.timer);+ if (element._tippy) element._tippy.destroy();return;}this.render(element);@@ -30,5 +34,28 @@ onedev.server.timeProgress = {const percent = Math.min(99, Math.max(0, elapsed / state.estimatedDuration * 100));element.querySelector('.time-progress-fill').style.width = percent + '%';element.setAttribute('aria-valuenow', Math.round(percent));+ const content = document.createElement('div');+ const elapsedLine = document.createElement('div');+ elapsedLine.textContent = element.dataset.elapsedTemplate.replace('{0}', this.formatDuration(element, elapsed));+ content.appendChild(elapsedLine);+ const remainingLine = document.createElement('div');+ remainingLine.textContent = element.dataset.remainingTemplate.replace('{0}',+ this.formatDuration(element, Math.max(0, state.estimatedDuration - elapsed)));+ content.appendChild(remainingLine);+ if (element._tippy) {+ element._tippy.setContent(content);+ } else {+ tippy(element, {content: content, delay: [500, 0], placement: 'auto'});+ }+ },+ formatDuration: function(element, duration) {+ const seconds = Math.floor(duration);+ const minutes = Math.floor(seconds / 60);+ const hours = Math.floor(minutes / 60);+ if (hours > 0)+ return element.dataset.hoursTemplate.replace('{0}', hours).replace('{1}', minutes % 60).replace('{2}', seconds % 60);+ if (minutes > 0)+ return element.dataset.minutesTemplate.replace('{0}', minutes).replace('{1}', seconds % 60);+ return element.dataset.secondsTemplate.replace('{0}', seconds);}};diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.javaindex b090425fa0..35d2e7fb03 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_de.java@@ -131,6 +131,7 @@ public class Translation_de extends TranslationResourceBundle {"Ein <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java-Muster</a> wird hier erwartet");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java regular expression</a> to validate commit message footer","Ein <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java-Regulärer Ausdruck</a>, um die Commit-Nachrichten-Fußzeile zu validieren");+ m.put("A JSON version of this API help is available for AI agents at", "Eine JSON-Version dieser API-Hilfe ist für KI-Agenten verfügbar unter");m.put("A child project with name \"{0}\" already exists under \"{1}\"", "Ein untergeordnetes Projekt mit dem Namen \"{0}\" existiert bereits unter \"{1}\"");m.put("A file exists where you’re trying to create a subdirectory. Choose a new path and try again..","Eine Datei existiert dort, wo Sie versuchen, ein Unterverzeichnis zu erstellen. Wählen Sie einen neuen Pfad und versuchen Sie es erneut.");@@ -2568,7 +2569,9 @@ public class Translation_de extends TranslationResourceBundle {m.put("OAuth2 Client information | CLIENT ID", "OAuth2-Client-Informationen | CLIENT-ID");m.put("OAuth2 Client information | CLIENT SECRET", "OAuth2-Client-Informationen | CLIENT-SECRET");m.put("OCI Layout Directory", "OCI-Layout-Verzeichnis");+ m.put("OFF", "AUS");m.put("OIDC error: Inconsistent sub in ID token and userinfo", "OIDC-Fehler: Inkonsistenter Sub in ID-Token und Benutzerinfo");+ m.put("ON", "AN");m.put("OOPS! There Is An Error", "OOPS! Es gibt einen Fehler");m.put("OPEN", "OFFEN");m.put("OS", "Betriebssystem");@@ -4184,6 +4187,8 @@ public class Translation_de extends TranslationResourceBundle {"Geben Sie den zu verwendenden Modellnamen an. <b class='text-danger'>HINWEIS: </b> Derzeit unterstützt OneDev nur\nModelle mit Chat-Vervollständigungs-API. OpenAI-Modelle mit der neuen Antwort-API werden noch nicht unterstützt");m.put("Specify the private key (in PEM format) used by SSH server to establish connections with client","Geben Sie den privaten Schlüssel (im PEM-Format) an, der vom SSH-Server verwendet wird, um Verbindungen mit dem Client herzustellen");+ m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",+ "Geben Sie den Repository-Ordner an, um Wiki-Seiten zu speichern. Lassen Sie das Feld leer, um vom übergeordneten Element zu erben.\nWenn Sie keine Wiki-Seiten im Projekt-Repository speichern möchten, kann der angegebene Ordner\nein Git-Submodul sein. Um Dateien aus dem Wiki-Seiten-Panel auszuschließen, fügen Sie eine <code>.wikiignore</code>\nDatei im Stammordner des Wikis mit Git-Ignoriermustern relativ zu diesem Ordner hinzu.");m.put("Specify the strategy to retrieve group membership information. To give appropriate permissions to a LDAP group, a OneDev group with same name should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage group memberships at OneDev side","Geben Sie die Strategie an, um Informationen zur Gruppenmitgliedschaft abzurufen. Um einer LDAP-Gruppe entsprechende Berechtigungen zu erteilen, sollte eine OneDev-Gruppe mit demselben Namen definiert werden. Verwenden Sie die Strategie <tt>Gruppen nicht abrufen</tt>, wenn Sie die Gruppenmitgliedschaften auf der OneDev-Seite verwalten möchten");m.put("Specify timeout in seconds when communicating with mail server", "Geben Sie das Timeout in Sekunden an, wenn mit dem Mailserver kommuniziert wird");@@ -5011,6 +5016,8 @@ public class Translation_de extends TranslationResourceBundle {m.put("With current number of users ({0}), the subscription will be active until <b>{1}</b>","Mit der aktuellen Anzahl von Benutzern ({0}) bleibt das Abonnement bis <b>{1}</b> aktiv");m.put("Work In Progress", "In Arbeit");+ m.put("Work in Progress", "In Bearbeitung");+ m.put("Work in progress", "In Bearbeitung");m.put("Workflow reconciliation completed", "Workflow-Abgleich abgeschlossen");m.put("Working Directory", "Arbeitsverzeichnis");m.put("Workspace", "Arbeitsbereich");@@ -5319,13 +5326,10 @@ public class Translation_de extends TranslationResourceBundle {m.put("{jakarta.validation.constraints.NotEmpty.message}", "{jakarta.validation.constraints.NotEmpty.message}");m.put("{jakarta.validation.constraints.NotNull.message}", "{jakarta.validation.constraints.NotNull.message}");m.put("{jakarta.validation.constraints.Size.message}", "{jakarta.validation.constraints.Size.message}");- m.put("A JSON version of this API help is available for AI agents at", "Eine JSON-Version dieser API-Hilfe ist für KI-Agenten verfügbar unter");- m.put("OFF", "AUS");- m.put("ON", "AN");- m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",- "Geben Sie den Repository-Ordner an, um Wiki-Seiten zu speichern. Lassen Sie das Feld leer, um vom übergeordneten Element zu erben.\nWenn Sie keine Wiki-Seiten im Projekt-Repository speichern möchten, kann der angegebene Ordner\nein Git-Submodul sein. Um Dateien aus dem Wiki-Seiten-Panel auszuschließen, fügen Sie eine <code>.wikiignore</code>\nDatei im Stammordner des Wikis mit Git-Ignoriermustern relativ zu diesem Ordner hinzu.");- m.put("Work in Progress", "In Bearbeitung");- m.put("Work in progress", "In Bearbeitung");+ m.put("Elapsed time: {0}", "Verstrichene Zeit: {0}");+ m.put("Estimated remaining time: {0}", "Geschätzte verbleibende Zeit: {0}");+ m.put("{0}h {1}m {2}s", "{0}h {1}m {2}s");+ m.put("{0}m {1}s", "{0}m {1}s");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.javaindex cf4ba67029..f096381e2d 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_es.java@@ -131,6 +131,7 @@ public class Translation_es extends TranslationResourceBundle {"Se espera aquí un <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>patrón de Java</a>");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java regular expression</a> to validate commit message footer","Una <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>expresión regular de Java</a> para validar el pie de mensaje de commit");+ m.put("A JSON version of this API help is available for AI agents at", "Una versión JSON de esta ayuda de API está disponible para agentes de IA en");m.put("A child project with name \"{0}\" already exists under \"{1}\"", "Ya existe un proyecto hijo con el nombre \"{0}\" bajo \"{1}\"");m.put("A file exists where you’re trying to create a subdirectory. Choose a new path and try again..","Un archivo existe donde estás intentando crear un subdirectorio. Elige una nueva ruta e inténtalo de nuevo.");@@ -2568,7 +2569,9 @@ public class Translation_es extends TranslationResourceBundle {m.put("OAuth2 Client information | CLIENT ID", "Información del cliente OAuth2 | ID DEL CLIENTE");m.put("OAuth2 Client information | CLIENT SECRET", "Información del cliente OAuth2 | SECRETO DEL CLIENTE");m.put("OCI Layout Directory", "Directorio de diseño OCI");+ m.put("OFF", "APAGADO");m.put("OIDC error: Inconsistent sub in ID token and userinfo", "Error OIDC: Sub inconsistente en el token ID y la información del usuario");+ m.put("ON", "ENCENDIDO");m.put("OOPS! There Is An Error", "¡UPS! Hay un error");m.put("OPEN", "ABIERTO");m.put("OS", "Sistema Operativo");@@ -4184,6 +4187,8 @@ public class Translation_es extends TranslationResourceBundle {"Especifique el nombre del modelo a usar. <b class='text-danger'>NOTA: </b> Actualmente OneDev solo soporta\nmodelos con API de completaciones de chat. Los modelos de OpenAI con la nueva API de respuestas no están soportados aún");m.put("Specify the private key (in PEM format) used by SSH server to establish connections with client","Especifique la clave privada (en formato PEM) utilizada por el servidor SSH para establecer conexiones con el cliente");+ m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",+ "Especifique la carpeta del repositorio para almacenar las páginas del wiki. Déjelo vacío para heredar del padre.\nSi no desea almacenar las páginas del wiki en el repositorio del proyecto, la carpeta especificada\npuede ser un submódulo de Git. Para excluir archivos del panel de páginas del wiki, agregue un archivo <code>.wikiignore</code>\nen la carpeta raíz del wiki con patrones de exclusión de Git relativos a esa carpeta");m.put("Specify the strategy to retrieve group membership information. To give appropriate permissions to a LDAP group, a OneDev group with same name should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage group memberships at OneDev side","Especifique la estrategia para recuperar información de membresía de grupo. Para otorgar permisos apropiados a un grupo LDAP, se debe definir un grupo de OneDev con el mismo nombre. Use la estrategia <tt>No Recuperar Grupos</tt> si desea gestionar las membresías de grupo en el lado de OneDev");m.put("Specify timeout in seconds when communicating with mail server", "Especifique el tiempo de espera en segundos al comunicarse con el servidor de correo");@@ -5011,6 +5016,8 @@ public class Translation_es extends TranslationResourceBundle {m.put("With current number of users ({0}), the subscription will be active until <b>{1}</b>","Con el número actual de usuarios ({0}), la suscripción estará activa hasta <b>{1}</b>");m.put("Work In Progress", "Trabajo en Progreso");+ m.put("Work in Progress", "Trabajo en progreso");+ m.put("Work in progress", "Trabajo en progreso");m.put("Workflow reconciliation completed", "Reconciliación del flujo de trabajo completada");m.put("Working Directory", "Directorio de Trabajo");m.put("Workspace", "Espacio de Trabajo");@@ -5319,13 +5326,10 @@ public class Translation_es extends TranslationResourceBundle {m.put("{jakarta.validation.constraints.NotEmpty.message}", "{jakarta.validation.constraints.NotEmpty.message}");m.put("{jakarta.validation.constraints.NotNull.message}", "{jakarta.validation.constraints.NotNull.message}");m.put("{jakarta.validation.constraints.Size.message}", "{jakarta.validation.constraints.Size.message}");- m.put("A JSON version of this API help is available for AI agents at", "Una versión JSON de esta ayuda de API está disponible para agentes de IA en");- m.put("OFF", "APAGADO");- m.put("ON", "ENCENDIDO");- m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",- "Especifique la carpeta del repositorio para almacenar las páginas del wiki. Déjelo vacío para heredar del padre.\nSi no desea almacenar las páginas del wiki en el repositorio del proyecto, la carpeta especificada\npuede ser un submódulo de Git. Para excluir archivos del panel de páginas del wiki, agregue un archivo <code>.wikiignore</code>\nen la carpeta raíz del wiki con patrones de exclusión de Git relativos a esa carpeta");- m.put("Work in Progress", "Trabajo en progreso");- m.put("Work in progress", "Trabajo en progreso");+ m.put("Elapsed time: {0}", "Tiempo transcurrido: {0}");+ m.put("Estimated remaining time: {0}", "Tiempo estimado restante: {0}");+ m.put("{0}h {1}m {2}s", "{0}h {1}m {2}s");+ m.put("{0}m {1}s", "{0}m {1}s");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.javaindex a7f72665e2..dfddd7db53 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_fr.java@@ -131,6 +131,7 @@ public class Translation_fr extends TranslationResourceBundle {"Un <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>modèle Java</a> est attendu ici");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java regular expression</a> to validate commit message footer","Une <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>expression régulière Java</a> pour valider le pied de page du message de commit");+ m.put("A JSON version of this API help is available for AI agents at", "Une version JSON de cette aide API est disponible pour les agents IA à");m.put("A child project with name \"{0}\" already exists under \"{1}\"", "Un projet enfant avec le nom \"{0}\" existe déjà sous \"{1}\"");m.put("A file exists where you’re trying to create a subdirectory. Choose a new path and try again..","Un fichier existe là où vous essayez de créer un sous-répertoire. Choisissez un nouveau chemin et réessayez.");@@ -2568,7 +2569,9 @@ public class Translation_fr extends TranslationResourceBundle {m.put("OAuth2 Client information | CLIENT ID", "Informations du client OAuth2 | ID CLIENT");m.put("OAuth2 Client information | CLIENT SECRET", "Informations du client OAuth2 | SECRET CLIENT");m.put("OCI Layout Directory", "Répertoire de disposition OCI");+ m.put("OFF", "OFF");m.put("OIDC error: Inconsistent sub in ID token and userinfo", "Erreur OIDC : Sub incohérent dans le jeton ID et les informations utilisateur");+ m.put("ON", "ON");m.put("OOPS! There Is An Error", "OUPS ! Il y a une erreur");m.put("OPEN", "OUVERT");m.put("OS", "Système d'exploitation");@@ -4184,6 +4187,8 @@ public class Translation_fr extends TranslationResourceBundle {"Spécifiez le nom du modèle à utiliser. <b class='text-danger'>REMARQUE :</b> Actuellement, OneDev ne prend en charge que\nles modèles avec l'API de complétions de chat. Les modèles OpenAI avec la nouvelle API de réponses ne sont pas encore pris en charge");m.put("Specify the private key (in PEM format) used by SSH server to establish connections with client","Spécifiez la clé privée (au format PEM) utilisée par le serveur SSH pour établir des connexions avec le client");+ m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",+ "Spécifiez le dossier du dépôt pour stocker les pages wiki. Laissez vide pour hériter du parent.\nSi vous ne souhaitez pas stocker les pages wiki dans le dépôt du projet, le dossier spécifié\npeut être un sous-module Git. Pour exclure des fichiers du panneau Pages wiki, ajoutez un fichier <code>.wikiignore</code>\ndans le dossier racine du wiki avec des modèles d'ignorance Git relatifs à ce dossier");m.put("Specify the strategy to retrieve group membership information. To give appropriate permissions to a LDAP group, a OneDev group with same name should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage group memberships at OneDev side","Spécifiez la stratégie pour récupérer les informations d'appartenance au groupe. Pour attribuer des permissions appropriées à un groupe LDAP, un groupe OneDev portant le même nom doit être défini. Utilisez la stratégie <tt>Ne pas récupérer les groupes</tt> si vous souhaitez gérer les appartenances aux groupes du côté de OneDev");m.put("Specify timeout in seconds when communicating with mail server", "Spécifiez le délai d'attente en secondes lors de la communication avec le serveur de messagerie");@@ -5011,6 +5016,8 @@ public class Translation_fr extends TranslationResourceBundle {m.put("With current number of users ({0}), the subscription will be active until <b>{1}</b>","Avec le nombre actuel d'utilisateurs ({0}), l'abonnement sera actif jusqu'au <b>{1}</b>");m.put("Work In Progress", "Travail en cours");+ m.put("Work in Progress", "Travail en cours");+ m.put("Work in progress", "Travail en cours");m.put("Workflow reconciliation completed", "Réconciliation du workflow terminée");m.put("Working Directory", "Répertoire de travail");m.put("Workspace", "Espace de travail");@@ -5319,13 +5326,10 @@ public class Translation_fr extends TranslationResourceBundle {m.put("{jakarta.validation.constraints.NotEmpty.message}", "{jakarta.validation.constraints.NotEmpty.message}");m.put("{jakarta.validation.constraints.NotNull.message}", "{jakarta.validation.constraints.NotNull.message}");m.put("{jakarta.validation.constraints.Size.message}", "{jakarta.validation.constraints.Size.message}");- m.put("A JSON version of this API help is available for AI agents at", "Une version JSON de cette aide API est disponible pour les agents IA à");- m.put("OFF", "OFF");- m.put("ON", "ON");- m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",- "Spécifiez le dossier du dépôt pour stocker les pages wiki. Laissez vide pour hériter du parent.\nSi vous ne souhaitez pas stocker les pages wiki dans le dépôt du projet, le dossier spécifié\npeut être un sous-module Git. Pour exclure des fichiers du panneau Pages wiki, ajoutez un fichier <code>.wikiignore</code>\ndans le dossier racine du wiki avec des modèles d'ignorance Git relatifs à ce dossier");- m.put("Work in Progress", "Travail en cours");- m.put("Work in progress", "Travail en cours");+ m.put("Elapsed time: {0}", "Temps écoulé : {0}");+ m.put("Estimated remaining time: {0}", "Temps restant estimé : {0}");+ m.put("{0}h {1}m {2}s", "{0}h {1}m {2}s");+ m.put("{0}m {1}s", "{0}m {1}s");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.javaindex cb24efe061..eaae6661b6 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_it.java@@ -131,6 +131,7 @@ public class Translation_it extends TranslationResourceBundle {"Qui è previsto un <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>pattern Java</a>");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java regular expression</a> to validate commit message footer","Un <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>espressione regolare Java</a> per validare il footer del messaggio di commit");+ m.put("A JSON version of this API help is available for AI agents at", "Una versione JSON di questo aiuto API è disponibile per gli agenti AI su");m.put("A child project with name \"{0}\" already exists under \"{1}\"", "Un progetto figlio con nome \"{0}\" esiste già sotto \"{1}\"");m.put("A file exists where you’re trying to create a subdirectory. Choose a new path and try again..","Esiste un file dove stai cercando di creare una sottodirectory. Scegli un nuovo percorso e riprova.");@@ -2568,7 +2569,9 @@ public class Translation_it extends TranslationResourceBundle {m.put("OAuth2 Client information | CLIENT ID", "Informazioni Client OAuth2 | CLIENT ID");m.put("OAuth2 Client information | CLIENT SECRET", "Informazioni Client OAuth2 | CLIENT SECRET");m.put("OCI Layout Directory", "Directory Layout OCI");+ m.put("OFF", "SPENTO");m.put("OIDC error: Inconsistent sub in ID token and userinfo", "Errore OIDC: Sub incoerente nel token ID e userinfo");+ m.put("ON", "ACCESO");m.put("OOPS! There Is An Error", "OOPS! C'è un errore");m.put("OPEN", "APERTA");m.put("OS", "Sistema Operativo");@@ -4184,6 +4187,8 @@ public class Translation_it extends TranslationResourceBundle {"Specifica il nome del modello da utilizzare. <b class='text-danger'>NOTA: </b> Al momento OneDev supporta solo\nmodelli con l'API di completamento delle chat. I modelli OpenAI con la nuova API di risposte non sono ancora supportati");m.put("Specify the private key (in PEM format) used by SSH server to establish connections with client","Specifica la chiave privata (in formato PEM) utilizzata dal server SSH per stabilire connessioni con il client");+ m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",+ "Specifica la cartella del repository per memorizzare le pagine wiki. Lascia vuoto per ereditare dal genitore.\nSe non vuoi memorizzare le pagine wiki nel repository del progetto, la cartella specificata\npuò essere un sottogruppo Git. Per escludere file dal pannello delle pagine Wiki, aggiungi un file <code>.wikiignore</code>\nnella cartella radice del wiki con i modelli di esclusione Git relativi a quella cartella");m.put("Specify the strategy to retrieve group membership information. To give appropriate permissions to a LDAP group, a OneDev group with same name should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage group memberships at OneDev side","Specifica la strategia per recuperare informazioni sull'appartenenza ai gruppi. Per assegnare permessi appropriati a un gruppo LDAP, deve essere definito un gruppo OneDev con lo stesso nome. Usa la strategia <tt>Non Recuperare Gruppi</tt> se desideri gestire le appartenenze ai gruppi sul lato OneDev");m.put("Specify timeout in seconds when communicating with mail server", "Specifica il timeout in secondi durante la comunicazione con il server di posta");@@ -5011,6 +5016,8 @@ public class Translation_it extends TranslationResourceBundle {m.put("With current number of users ({0}), the subscription will be active until <b>{1}</b>","Con il numero attuale di utenti ({0}), l'abbonamento sarà attivo fino al <b>{1}</b>");m.put("Work In Progress", "Lavoro in Corso");+ m.put("Work in Progress", "Lavoro in corso");+ m.put("Work in progress", "Lavoro in corso");m.put("Workflow reconciliation completed", "Riconciliazione del flusso di lavoro completata");m.put("Working Directory", "Directory di Lavoro");m.put("Workspace", "Workspace");@@ -5319,13 +5326,10 @@ public class Translation_it extends TranslationResourceBundle {m.put("{jakarta.validation.constraints.NotEmpty.message}", "{jakarta.validation.constraints.NotEmpty.message}");m.put("{jakarta.validation.constraints.NotNull.message}", "{jakarta.validation.constraints.NotNull.message}");m.put("{jakarta.validation.constraints.Size.message}", "{jakarta.validation.constraints.Size.message}");- m.put("A JSON version of this API help is available for AI agents at", "Una versione JSON di questo aiuto API è disponibile per gli agenti AI su");- m.put("OFF", "SPENTO");- m.put("ON", "ACCESO");- m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",- "Specifica la cartella del repository per memorizzare le pagine wiki. Lascia vuoto per ereditare dal genitore.\nSe non vuoi memorizzare le pagine wiki nel repository del progetto, la cartella specificata\npuò essere un sottogruppo Git. Per escludere file dal pannello delle pagine Wiki, aggiungi un file <code>.wikiignore</code>\nnella cartella radice del wiki con i modelli di esclusione Git relativi a quella cartella");- m.put("Work in Progress", "Lavoro in corso");- m.put("Work in progress", "Lavoro in corso");+ m.put("Elapsed time: {0}", "Tempo trascorso: {0}");+ m.put("Estimated remaining time: {0}", "Tempo stimato rimanente: {0}");+ m.put("{0}h {1}m {2}s", "{0}h {1}m {2}s");+ m.put("{0}m {1}s", "{0}m {1}s");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.javaindex 0f7db9dc85..6be97f452d 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ja.java@@ -131,6 +131,7 @@ public class Translation_ja extends TranslationResourceBundle {"ここには<a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Javaパターン</a>が必要です");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java regular expression</a> to validate commit message footer","コミットメッセージのフッターを検証するための<a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java正規表現</a>");+ m.put("A JSON version of this API help is available for AI agents at", "このAPIヘルプのJSONバージョンは、AIエージェント向けに利用可能です");m.put("A child project with name \"{0}\" already exists under \"{1}\"", "\"{1}\" の下に \"{0}\" という名前の子プロジェクトがすでに存在します");m.put("A file exists where you’re trying to create a subdirectory. Choose a new path and try again..","サブディレクトリを作成しようとしている場所にファイルが存在します。新しいパスを選択して再試行してください。");@@ -2568,7 +2569,9 @@ public class Translation_ja extends TranslationResourceBundle {m.put("OAuth2 Client information | CLIENT ID", "OAuth2クライアント情報 | クライアントID");m.put("OAuth2 Client information | CLIENT SECRET", "OAuth2クライアント情報 | クライアントシークレット");m.put("OCI Layout Directory", "OCIレイアウトディレクトリ");+ m.put("OFF", "オフ");m.put("OIDC error: Inconsistent sub in ID token and userinfo", "OIDCエラー: IDトークンとユーザー情報のサブが一致しません");+ m.put("ON", "オン");m.put("OOPS! There Is An Error", "おっと!エラーがあります");m.put("OPEN", "オープン");m.put("OS", "OS");@@ -4184,6 +4187,8 @@ public class Translation_ja extends TranslationResourceBundle {"使用するモデル名を指定します。<b class='text-danger'>注意:</b> 現在、OneDevは\nチャット完了APIを持つモデルのみをサポートしています。OpenAIの新しい応答APIを持つモデルはまだサポートされていません");m.put("Specify the private key (in PEM format) used by SSH server to establish connections with client","SSHサーバーがクライアントとの接続を確立するために使用する秘密鍵(PEM形式)を指定してください。");+ m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",+ "Wikiページを保存するリポジトリフォルダーを指定してください。親から継承する場合は空のままにします。\nプロジェクトリポジトリにWikiページを保存したくない場合、指定されたフォルダー\nはGitサブモジュールにすることができます。Wikiページパネルからファイルを除外するには、<code>.wikiignore</code>\nファイルをWikiルートフォルダーに作成し、そのフォルダーに対するGit無視パターンを追加してください");m.put("Specify the strategy to retrieve group membership information. To give appropriate permissions to a LDAP group, a OneDev group with same name should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage group memberships at OneDev side","グループメンバーシップ情報を取得する戦略を指定してください。LDAPグループに適切な権限を付与するには、同じ名前のOneDevグループを定義する必要があります。グループメンバーシップをOneDev側で管理したい場合は、<tt>グループを取得しない</tt>戦略を使用してください。");m.put("Specify timeout in seconds when communicating with mail server", "メールサーバーと通信する際のタイムアウトを秒単位で指定してください。");@@ -5011,6 +5016,8 @@ public class Translation_ja extends TranslationResourceBundle {m.put("With current number of users ({0}), the subscription will be active until <b>{1}</b>","現在のユーザー数({0})で、サブスクリプションは<b>{1}</b>まで有効です");m.put("Work In Progress", "作業中");+ m.put("Work in Progress", "作業中");+ m.put("Work in progress", "作業中");m.put("Workflow reconciliation completed", "ワークフローの調整が完了しました");m.put("Working Directory", "作業ディレクトリ");m.put("Workspace", "ワークスペース");@@ -5319,13 +5326,10 @@ public class Translation_ja extends TranslationResourceBundle {m.put("{jakarta.validation.constraints.NotEmpty.message}", "{jakarta.validation.constraints.NotEmpty.message}");m.put("{jakarta.validation.constraints.NotNull.message}", "{jakarta.validation.constraints.NotNull.message}");m.put("{jakarta.validation.constraints.Size.message}", "{jakarta.validation.constraints.Size.message}");- m.put("A JSON version of this API help is available for AI agents at", "このAPIヘルプのJSONバージョンは、AIエージェント向けに利用可能です");- m.put("OFF", "オフ");- m.put("ON", "オン");- m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",- "Wikiページを保存するリポジトリフォルダーを指定してください。親から継承する場合は空のままにします。\nプロジェクトリポジトリにWikiページを保存したくない場合、指定されたフォルダー\nはGitサブモジュールにすることができます。Wikiページパネルからファイルを除外するには、<code>.wikiignore</code>\nファイルをWikiルートフォルダーに作成し、そのフォルダーに対するGit無視パターンを追加してください");- m.put("Work in Progress", "作業中");- m.put("Work in progress", "作業中");+ m.put("Elapsed time: {0}", "経過時間: {0}");+ m.put("Estimated remaining time: {0}", "推定残り時間: {0}");+ m.put("{0}h {1}m {2}s", "{0}時間 {1}分 {2}秒");+ m.put("{0}m {1}s", "{0}分 {1}秒");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.javaindex bf50ccbfa7..c4ca01f80d 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_ko.java@@ -131,6 +131,7 @@ public class Translation_ko extends TranslationResourceBundle {"여기에 <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java 패턴</a>이 필요합니다");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java regular expression</a> to validate commit message footer","커밋 메시지 푸터를 검증하기 위한 <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java 정규 표현식</a>");+ m.put("A JSON version of this API help is available for AI agents at", "이 API 도움말의 JSON 버전은 AI 에이전트를 위해 제공됩니다.");m.put("A child project with name \"{0}\" already exists under \"{1}\"", "\"{1}\" 아래에 이름이 \"{0}\"인 하위 프로젝트가 이미 존재합니다");m.put("A file exists where you’re trying to create a subdirectory. Choose a new path and try again..","하위 디렉토리를 생성하려는 위치에 파일이 존재합니다. 새로운 경로를 선택하고 다시 시도하세요.");@@ -2568,7 +2569,9 @@ public class Translation_ko extends TranslationResourceBundle {m.put("OAuth2 Client information | CLIENT ID", "OAuth2 클라이언트 정보 | CLIENT ID");m.put("OAuth2 Client information | CLIENT SECRET", "OAuth2 클라이언트 정보 | CLIENT SECRET");m.put("OCI Layout Directory", "OCI 레이아웃 디렉토리");+ m.put("OFF", "꺼짐");m.put("OIDC error: Inconsistent sub in ID token and userinfo", "OIDC 오류: ID 토큰과 사용자 정보의 하위가 일치하지 않음");+ m.put("ON", "켜짐");m.put("OOPS! There Is An Error", "이런! 오류가 발생했습니다");m.put("OPEN", "열림");m.put("OS", "운영 체제");@@ -4184,6 +4187,8 @@ public class Translation_ko extends TranslationResourceBundle {"사용할 모델 이름을 지정하십시오. <b class='text-danger'>참고:</b> 현재 OneDev는\n채팅 완료 API가 있는 모델만 지원합니다. OpenAI의 새로운 응답 API가 있는 모델은 아직 지원되지 않습니다");m.put("Specify the private key (in PEM format) used by SSH server to establish connections with client","SSH 서버가 클라이언트와 연결을 설정하는 데 사용하는 개인 키(PEM 형식)를 지정하십시오.");+ m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",+ "위키 페이지를 저장할 저장소 폴더를 지정하세요. 상위에서 상속받으려면 비워 두세요.\n프로젝트 저장소에 위키 페이지를 저장하지 않으려면, 지정된 폴더는\nGit 서브모듈일 수 있습니다. 위키 페이지 패널에서 파일을 제외하려면, 위키 루트 폴더에 Git 무시 패턴을 포함한 <code>.wikiignore</code>\n파일을 추가하세요.");m.put("Specify the strategy to retrieve group membership information. To give appropriate permissions to a LDAP group, a OneDev group with same name should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage group memberships at OneDev side","그룹 멤버십 정보를 검색하는 전략을 지정하십시오. LDAP 그룹에 적절한 권한을 부여하려면 동일한 이름의 OneDev 그룹을 정의해야 합니다. 그룹 멤버십을 OneDev 측에서 관리하려면 <tt>그룹 검색 안 함</tt> 전략을 사용하십시오.");m.put("Specify timeout in seconds when communicating with mail server", "메일 서버와 통신할 때의 타임아웃(초)을 지정하십시오.");@@ -5011,6 +5016,8 @@ public class Translation_ko extends TranslationResourceBundle {m.put("With current number of users ({0}), the subscription will be active until <b>{1}</b>","현재 사용자 수 ({0})로 구독은 <b>{1}</b>까지 활성화됩니다");m.put("Work In Progress", "작업 진행 중");+ m.put("Work in Progress", "작업 진행 중");+ m.put("Work in progress", "작업 진행 중");m.put("Workflow reconciliation completed", "워크플로우 조정 완료");m.put("Working Directory", "작업 디렉토리");m.put("Workspace", "워크스페이스");@@ -5319,13 +5326,10 @@ public class Translation_ko extends TranslationResourceBundle {m.put("{jakarta.validation.constraints.NotEmpty.message}", "{jakarta.validation.constraints.NotEmpty.message}");m.put("{jakarta.validation.constraints.NotNull.message}", "{jakarta.validation.constraints.NotNull.message}");m.put("{jakarta.validation.constraints.Size.message}", "{jakarta.validation.constraints.Size.message}");- m.put("A JSON version of this API help is available for AI agents at", "이 API 도움말의 JSON 버전은 AI 에이전트를 위해 제공됩니다.");- m.put("OFF", "꺼짐");- m.put("ON", "켜짐");- m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",- "위키 페이지를 저장할 저장소 폴더를 지정하세요. 상위에서 상속받으려면 비워 두세요.\n프로젝트 저장소에 위키 페이지를 저장하지 않으려면, 지정된 폴더는\nGit 서브모듈일 수 있습니다. 위키 페이지 패널에서 파일을 제외하려면, 위키 루트 폴더에 Git 무시 패턴을 포함한 <code>.wikiignore</code>\n파일을 추가하세요.");- m.put("Work in Progress", "작업 진행 중");- m.put("Work in progress", "작업 진행 중");+ m.put("Elapsed time: {0}", "경과 시간: {0}");+ m.put("Estimated remaining time: {0}", "예상 남은 시간: {0}");+ m.put("{0}h {1}m {2}s", "{0}시간 {1}분 {2}초");+ m.put("{0}m {1}s", "{0}분 {1}초");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.javaindex 572dcac1c5..988b972f11 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_pt.java@@ -131,6 +131,7 @@ public class Translation_pt extends TranslationResourceBundle {"Um <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>padrão Java</a> é esperado aqui");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java regular expression</a> to validate commit message footer","Uma <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>expressão regular Java</a> para validar o rodapé da mensagem de commit");+ m.put("A JSON version of this API help is available for AI agents at", "Uma versão JSON desta ajuda da API está disponível para agentes de IA em");m.put("A child project with name \"{0}\" already exists under \"{1}\"", "Um projeto filho com o nome \"{0}\" já existe sob \"{1}\"");m.put("A file exists where you’re trying to create a subdirectory. Choose a new path and try again..","Um arquivo existe onde você está tentando criar um subdiretório. Escolha um novo caminho e tente novamente.");@@ -2568,7 +2569,9 @@ public class Translation_pt extends TranslationResourceBundle {m.put("OAuth2 Client information | CLIENT ID", "Informações do Cliente OAuth2 | CLIENT ID");m.put("OAuth2 Client information | CLIENT SECRET", "Informações do Cliente OAuth2 | CLIENT SECRET");m.put("OCI Layout Directory", "Diretório de Layout OCI");+ m.put("OFF", "DESLIGADO");m.put("OIDC error: Inconsistent sub in ID token and userinfo", "Erro OIDC: Sub inconsistente no token ID e userinfo");+ m.put("ON", "LIGADO");m.put("OOPS! There Is An Error", "OOPS! Há Um Erro");m.put("OPEN", "ABERTO");m.put("OS", "Sistema Operacional");@@ -4184,6 +4187,8 @@ public class Translation_pt extends TranslationResourceBundle {"Especifique o nome do modelo a ser usado. <b class='text-danger'>NOTA: </b> No momento, o OneDev só suporta\nmodelos com API de conclusões de chat. Modelos OpenAI com a nova API de respostas ainda não são suportados");m.put("Specify the private key (in PEM format) used by SSH server to establish connections with client","Especifique a chave privada (em formato PEM) usada pelo servidor SSH para estabelecer conexões com o cliente");+ m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",+ "Especifique a pasta do repositório para armazenar as páginas do wiki. Deixe vazio para herdar do pai.\nSe você não quiser armazenar as páginas do wiki no repositório do projeto, a pasta especificada\npode ser um submódulo Git. Para excluir arquivos do painel de Páginas do wiki, adicione um arquivo <code>.wikiignore</code>\nna pasta raiz do wiki com padrões de exclusão do Git relativos a essa pasta");m.put("Specify the strategy to retrieve group membership information. To give appropriate permissions to a LDAP group, a OneDev group with same name should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage group memberships at OneDev side","Especifique a estratégia para recuperar informações de associação de grupo. Para conceder permissões apropriadas a um grupo LDAP, um grupo OneDev com o mesmo nome deve ser definido. Use a estratégia <tt>Não Recuperar Grupos</tt> se desejar gerenciar associações de grupo no lado do OneDev");m.put("Specify timeout in seconds when communicating with mail server", "Especifique o tempo limite em segundos ao se comunicar com o servidor de e-mail");@@ -5011,6 +5016,8 @@ public class Translation_pt extends TranslationResourceBundle {m.put("With current number of users ({0}), the subscription will be active until <b>{1}</b>","Com o número atual de usuários ({0}), a assinatura estará ativa até <b>{1}</b>");m.put("Work In Progress", "Trabalho em Andamento");+ m.put("Work in Progress", "Trabalho em Progresso");+ m.put("Work in progress", "Trabalho em progresso");m.put("Workflow reconciliation completed", "Reconciliação de workflow concluída");m.put("Working Directory", "Diretório de Trabalho");m.put("Workspace", "Workspace");@@ -5319,13 +5326,10 @@ public class Translation_pt extends TranslationResourceBundle {m.put("{jakarta.validation.constraints.NotEmpty.message}", "{jakarta.validation.constraints.NotEmpty.message}");m.put("{jakarta.validation.constraints.NotNull.message}", "{jakarta.validation.constraints.NotNull.message}");m.put("{jakarta.validation.constraints.Size.message}", "{jakarta.validation.constraints.Size.message}");- m.put("A JSON version of this API help is available for AI agents at", "Uma versão JSON desta ajuda da API está disponível para agentes de IA em");- m.put("OFF", "DESLIGADO");- m.put("ON", "LIGADO");- m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",- "Especifique a pasta do repositório para armazenar as páginas do wiki. Deixe vazio para herdar do pai.\nSe você não quiser armazenar as páginas do wiki no repositório do projeto, a pasta especificada\npode ser um submódulo Git. Para excluir arquivos do painel de Páginas do wiki, adicione um arquivo <code>.wikiignore</code>\nna pasta raiz do wiki com padrões de exclusão do Git relativos a essa pasta");- m.put("Work in Progress", "Trabalho em Progresso");- m.put("Work in progress", "Trabalho em progresso");+ m.put("Elapsed time: {0}", "Tempo decorrido: {0}");+ m.put("Estimated remaining time: {0}", "Tempo estimado restante: {0}");+ m.put("{0}h {1}m {2}s", "{0}h {1}m {2}s");+ m.put("{0}m {1}s", "{0}m {1}s");}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.javaindex d9567100e0..e01804278b 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh.java@@ -157,6 +157,7 @@ public class Translation_zh extends TranslationResourceBundle {"这里需要一个 <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java 正则表达式</a>");m.put("A <a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java regular expression</a> to validate commit message footer","用于验证提交信息页脚的<a href='https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html'>Java正则表达式</a>");+ m.put("A JSON version of this API help is available for AI agents at", "此 API 帮助的 JSON 版本可供 AI 代理使用");m.put("A child project with name \"{0}\" already exists under \"{1}\"", "在 \"{1}\" 下已存在名为 \"{0}\" 的子项目");m.put("A file exists where you’re trying to create a subdirectory. Choose a new path and try again..","您尝试创建子目录的地方已存在一个文件。请选择一个新路径并重试。");@@ -2594,7 +2595,9 @@ public class Translation_zh extends TranslationResourceBundle {m.put("OAuth2 Client information | CLIENT ID", "OAuth2 客户端信息 | CLIENT ID");m.put("OAuth2 Client information | CLIENT SECRET", "OAuth2 客户端信息 | CLIENT SECRET");m.put("OCI Layout Directory", "OCI 布局目录");+ m.put("OFF", "关闭");m.put("OIDC error: Inconsistent sub in ID token and userinfo", "ID 令牌中的 sub 与用户信息中的 sub 不一致");+ m.put("ON", "开启");m.put("OOPS! There Is An Error", "哎呀!发生错误");m.put("OPEN", "打开");m.put("OS", "操作系统");@@ -4210,6 +4213,8 @@ public class Translation_zh extends TranslationResourceBundle {"指定要使用的模型名称。<b class='text-danger'>注意:</b>目前 OneDev 仅支持\n具有聊天完成 API 的模型。尚不支持具有新响应 API 的 OpenAI 模型。");m.put("Specify the private key (in PEM format) used by SSH server to establish connections with client","指定用于与客户端建立连接的 SSH 服务器使用的私钥(在 PEM 格式中)");+ m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",+ "指定存储 wiki 页面的仓库文件夹。留空以继承自父级。\n如果您不想将 wiki 页面存储在项目仓库中,指定的文件夹\n可以是一个 Git 子模块。要从 wiki 页面面板中排除文件,请在 wiki 根文件夹中添加一个 <code>.wikiignore</code>\n文件,并使用相对于该文件夹的 Git 忽略模式");m.put("Specify the strategy to retrieve group membership information. To give appropriate permissions to a LDAP group, a OneDev group with same name should be defined. Use strategy <tt>Do Not Retrieve Groups</tt> if you want to manage group memberships at OneDev side","指定查询组成员信息的策略。要为 LDAP 组分配适当权限,应定义一个同名的 OneDev 组。如果您希望在 OneDev 端管理组成员关系,请使用策略 <tt>不查询组</tt>");m.put("Specify timeout in seconds when communicating with mail server", "指定与邮件服务器通信时的超时时间(秒)");@@ -5037,6 +5042,8 @@ public class Translation_zh extends TranslationResourceBundle {m.put("With current number of users ({0}), the subscription will be active until <b>{1}</b>","根据当前用户数({0}),订阅将有效至<b>{1}</b>");m.put("Work In Progress", "进行中");+ m.put("Work in Progress", "进行中");+ m.put("Work in progress", "进行中");m.put("Workflow reconciliation completed", "工单工作流一致性检查完成");m.put("Working Directory", "工作目录");m.put("Workspace", "工作区");@@ -5345,13 +5352,10 @@ public class Translation_zh extends TranslationResourceBundle {m.put("{jakarta.validation.constraints.NotEmpty.message}", "{jakarta.validation.constraints.NotEmpty.message}");m.put("{jakarta.validation.constraints.NotNull.message}", "{jakarta.validation.constraints.NotNull.message}");m.put("{jakarta.validation.constraints.Size.message}", "{jakarta.validation.constraints.Size.message}");- m.put("A JSON version of this API help is available for AI agents at", "此 API 帮助的 JSON 版本可供 AI 代理使用");- m.put("OFF", "关闭");- m.put("ON", "开启");- m.put("Specify the repository folder to store wiki pages. Leave empty to inherit from parent.\nIf you do not want to store wiki pages in the project repository, the specified folder\ncan be a Git submodule. To exclude files from the wiki Pages panel, add a <code>.wikiignore</code>\nfile in the wiki root folder with Git ignore patterns relative to that folder",- "指定存储 wiki 页面的仓库文件夹。留空以继承自父级。\n如果您不想将 wiki 页面存储在项目仓库中,指定的文件夹\n可以是一个 Git 子模块。要从 wiki 页面面板中排除文件,请在 wiki 根文件夹中添加一个 <code>.wikiignore</code>\n文件,并使用相对于该文件夹的 Git 忽略模式");- m.put("Work in Progress", "进行中");- m.put("Work in progress", "进行中");+ m.put("Elapsed time: {0}", "耗时: {0}");+ m.put("Estimated remaining time: {0}", "预计剩余时间: {0}");+ m.put("{0}h {1}m {2}s", "{0}小时 {1}分钟 {2}秒");+ m.put("{0}m {1}s", "{0}分钟 {1}秒");}@Overridediff --git a/server-core/src/test/java/io/onedev/server/web/component/progress/TimeProgressBarTest.java b/server-core/src/test/java/io/onedev/server/web/component/progress/TimeProgressBarTest.javaindex da86833a13..b481d9a407 100644--- a/server-core/src/test/java/io/onedev/server/web/component/progress/TimeProgressBarTest.java+++ b/server-core/src/test/java/io/onedev/server/web/component/progress/TimeProgressBarTest.java@@ -16,12 +16,16 @@ import org.junit.jupiter.api.Test;import org.junit.jupiter.params.ParameterizedTest;import org.junit.jupiter.params.provider.ValueSource;+import io.onedev.server.web.translation.TranslationStringResourceLoader;+class TimeProgressBarTest {private WicketTester tester;@BeforeEachvoid setUp() {tester = new WicketTester();+ tester.getApplication().getResourceSettings().getStringResourceLoaders()+ .add(0, new TranslationStringResourceLoader());}@AfterEach