Skip to content

Envolver en Idioma.t las cadenas que quedaban sueltas #16

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

Open
roysland wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Envolver en Idioma.t las cadenas que quedaban sueltas #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions plugins/Digivice/Combate.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ Item {

K4.Etiqueta {
anchors.centerIn: parent
text: "VS"
text: Idioma.t("VS")
font.pixelSize: 26
font.weight: Font.Bold
color: "#e8b45a"
Expand Down Expand Up @@ -881,7 +881,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter
text: self.aliadoUsado ? Idioma.t("ya vino")
: !Digivice.puedeLlamar ? Idioma.t("sin ⚡")
: "L · " + Digivice.costeLlamada + "⚡"
: Idioma.t("L · ") + Digivice.costeLlamada + "⚡"
font.pixelSize: 10
font.weight: Digivice.puedeLlamar && !self.aliadoUsado
? Font.Bold : Font.Normal
Expand Down
6 changes: 3 additions & 3 deletions plugins/Digivice/DigivicePlugin.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ K4Plugin {
id: self

name: "digivice"
title: "Digivice"
title: Idioma.t("Digivice")
priority: 63
active: habilitado && abierto

Expand Down Expand Up @@ -508,9 +508,9 @@ K4Plugin {
// quien no oiga nada pueda averiguar si es el fichero o el altavoz.
function pitar(nombre: string): string {
if (!self.zumbador)
return "la vista no está abierta"
return Idioma.t("la vista no está abierta")
self.zumbador.sonar(nombre)
return "sonando " + nombre
return Idioma.t("sonando ") + nombre
}

function sonidos(): string {
Expand Down
2 changes: 1 addition & 1 deletion plugins/Digivice/PantallaEstado.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ Item {

K4.Etiqueta {
width: parent.width
text: Digivice.victorias + "V / " + Digivice.derrotas + "D"
text: Digivice.victorias + Idioma.t("V / ") + Digivice.derrotas + Idioma.t("D")
font.pixelSize: 12
color: "#8fbf9c"
}
Expand Down
2 changes: 1 addition & 1 deletion plugins/Digivice/PantallaLista.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Item {

K4.Etiqueta {
width: parent.width * 0.42
text: self.ficha ? "N.º " + ("000" + self.ficha.id).slice(-3) : ""
text: self.ficha ? Idioma.t("N.º ") + ("000" + self.ficha.id).slice(-3) : ""
font.pixelSize: 12
color: "#8fbf9c"
}
Expand Down
6 changes: 3 additions & 3 deletions plugins/Files/FilesView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ FadeIn {
// ── dónde buscar y qué
Repeater {
model: [
{ id: "ambito", texto: "Todo el sistema" },
{ id: "archivo", texto: "Solo archivos" },
{ id: "dir", texto: "Solo carpetas" }
{ id: "ambito", texto: Idioma.t("Todo el sistema") },
{ id: "archivo", texto: Idioma.t("Solo archivos") },
{ id: "dir", texto: Idioma.t("Solo carpetas") }
]

delegate: Rectangle {
Expand Down
2 changes: 1 addition & 1 deletion plugins/Game/Crisol.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ Item {
if (!crisol.compatible)
return Idioma.t("no son iguales")
if (!crisol.lleno)
return Idioma.f("faltan %1",
return Idioma.f(Idioma.t("faltan %1"),
crisol.huecos - crisol.puestas.length)
return Idioma.t("FUNDIR")
}
Expand Down
1 change: 1 addition & 0 deletions plugins/Pantallas/PantallasView.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import QtQuick
import "../../services"
import K4 as K4

K4.Aparicion {
Expand Down
2 changes: 1 addition & 1 deletion plugins/Session/BloqueoSurface.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ K4.SuperficieBloqueo {

IslandLabel {
anchors.horizontalCenter: parent.horizontalCenter
text: Clock.date.toLocaleDateString(Idioma.locale, "dddd, d 'de' MMMM")
text: Clock.date.toLocaleDateString(Idioma.locale, Idioma.t("dddd, d 'de' MMMM"))
color: Theme.muted
font.pixelSize: 17
}
Expand Down
24 changes: 12 additions & 12 deletions services/Digivice.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,15 +221,15 @@ Singleton {
// Los "fields" de la API, que son afinidades de especie, se usan como
// mapa. Sale gratis y además agrupa bichos que pegan entre sí.
readonly property var zonas: [
{ id: "Nature Spirits", nombre: "Bosque Verde" },
{ id: "Deep Savers", nombre: "Mar Profundo" },
{ id: "Wind Guardians", nombre: "Cielo Roto" },
{ id: "Jungle Troopers", nombre: "Jungla" },
{ id: "Dragon's Roar", nombre: "Rugido del Dragón" },
{ id: "Metal Empire", nombre: "Imperio de Metal" },
{ id: "Nightmare Soldiers", nombre: "Pesadilla" },
{ id: "Virus Busters", nombre: "Orden" },
{ id: "Dark Area", nombre: "Área Oscura" }
{ id: "Nature Spirits", nombre: Idioma.t("Bosque Verde") },
{ id: "Deep Savers", nombre: Idioma.t("Mar Profundo") },
{ id: "Wind Guardians", nombre: Idioma.t("Cielo Roto") },
{ id: "Jungle Troopers", nombre: Idioma.t("Jungla") },
{ id: "Dragon's Roar", nombre: Idioma.t("Rugido del Dragón") },
{ id: "Metal Empire", nombre: Idioma.t("Imperio de Metal") },
{ id: "Nightmare Soldiers", nombre: Idioma.t("Pesadilla") },
{ id: "Virus Busters", nombre: Idioma.t("Orden") },
{ id: "Dark Area", nombre: Idioma.t("Área Oscura") }
]

// ── andar ─────────────────────────────────────────────────────
Expand Down Expand Up @@ -1749,9 +1749,9 @@ Singleton {
// en duro fallar del todo cuesta ánimo, y por eso elegir dificultad es
// una decisión y no un ajuste.
readonly property var dificultades: [
{ id: "facil", nombre: "Suave", factor: 1, castigo: false },
{ id: "normal", nombre: "Normal", factor: 2, castigo: false },
{ id: "duro", nombre: "Duro", factor: 3, castigo: true }
{ id: "facil", nombre: Idioma.t("Suave"), factor: 1, castigo: false },
{ id: "normal", nombre: Idioma.t("Normal"), factor: 2, castigo: false },
{ id: "duro", nombre: Idioma.t("Duro"), factor: 3, castigo: true }
]
property string dificultad: "normal"

Expand Down
2 changes: 1 addition & 1 deletion services/Editor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,7 +1809,7 @@ Singleton {
for (let i = 0; i < marcadores.length; ++i)
mayor = Math.max(mayor, Number(marcadores[i].id) || 0)
marcadores = marcadores.concat([{ id: mayor + 1, t: a,
nombre: nombre || "Marcador" }])
nombre: nombre || Idioma.t("Marcador") }])
.sort(function (x, y) { return x.t - y.t })
persistir()
return mayor + 1
Expand Down
2 changes: 1 addition & 1 deletion services/Game.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1302,7 +1302,7 @@ Singleton {
const base = enemigoVidaBase * Math.pow(enemigoVidaCrec, oleada - 1)
for (let k = 0; k < 2; ++k) {
const cual = faunaPorBioma[bioma][(oleada + k) % faunaPorBioma[bioma].length]
const esp = especies[cual] || ({ nombre: "Bicho", vida: 1, daño: 1 })
const esp = especies[cual] || ({ nombre: Idioma.t("Bicho"), vida: 1, daño: 1 })
e.push({
vida: base * 0.8, vidaMax: base * 0.8,
daño: enemigoDañoBase * Math.pow(enemigoDañoCrec, oleada - 1) * 0.7,
Expand Down
40 changes: 20 additions & 20 deletions services/PluginManager.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,26 @@ Singleton {
// copia mínima evita que la barra se quede sin defaults si el fichero se
// está actualizando o si se arranca con una versión antigua instalada.
property var catalogo: [
{ id: "idle", title: "Píldora", version: "1.0.0", enabled: true, configurable: false },
{ id: "volume", title: "Volumen", version: "1.0.0", enabled: true },
{ id: "clock", title: "Reloj", version: "1.0.0", enabled: true },
{ id: "player", title: "Reproductor", version: "1.0.0", enabled: true },
{ id: "toast", title: "Notificación", version: "1.0.0", enabled: true },
{ id: "panel", title: "Centro de control", version: "1.0.0", enabled: true },
{ id: "launcher", title: "Lanzador", version: "1.0.0", enabled: true },
{ id: "ask", title: "Preguntar", version: "1.0.0", enabled: true },
{ id: "hyprtheme", title: "Tema de Hyprland", version: "1.0.0", enabled: true },
{ id: "weather", title: "El tiempo", version: "1.0.0", enabled: true },
{ id: "tray", title: "Bandeja", version: "1.0.0", enabled: true },
{ id: "game", title: "Mazmorra", version: "1.0.0", enabled: true },
{ id: "settings", title: "Ajustes", version: "1.0.0", enabled: true, configurable: false },
{ id: "clipboard", title: "Portapapeles", version: "1.0.0", enabled: true },
{ id: "system", title: "Sistema", version: "1.0.0", enabled: true },
{ id: "files", title: "Archivos", version: "1.0.0", enabled: true },
{ id: "keys", title: "Atajos", version: "1.0.0", enabled: true },
{ id: "windows", title: "Ventanas", version: "1.0.0", enabled: true },
{ id: "session", title: "Sesión", version: "1.0.0", enabled: true },
{ id: "captura", title: "Captura", version: "1.0.0", enabled: true }
{ id: "idle", title: Idioma.t("Píldora"), version: "1.0.0", enabled: true, configurable: false },
{ id: "volume", title: Idioma.t("Volumen"), version: "1.0.0", enabled: true },
{ id: "clock", title: Idioma.t("Reloj"), version: "1.0.0", enabled: true },
{ id: "player", title: Idioma.t("Reproductor"), version: "1.0.0", enabled: true },
{ id: "toast", title: Idioma.t("Notificación"), version: "1.0.0", enabled: true },
{ id: "panel", title: Idioma.t("Centro de control"), version: "1.0.0", enabled: true },
{ id: "launcher", title: Idioma.t("Lanzador"), version: "1.0.0", enabled: true },
{ id: "ask", title: Idioma.t("Preguntar"), version: "1.0.0", enabled: true },
{ id: "hyprtheme", title: Idioma.t("Tema de Hyprland"), version: "1.0.0", enabled: true },
{ id: "weather", title: Idioma.t("El tiempo"), version: "1.0.0", enabled: true },
{ id: "tray", title: Idioma.t("Bandeja"), version: "1.0.0", enabled: true },
{ id: "game", title: Idioma.t("Mazmorra"), version: "1.0.0", enabled: true },
{ id: "settings", title: Idioma.t("Ajustes"), version: "1.0.0", enabled: true, configurable: false },
{ id: "clipboard", title: Idioma.t("Portapapeles"), version: "1.0.0", enabled: true },
{ id: "system", title: Idioma.t("Sistema"), version: "1.0.0", enabled: true },
{ id: "files", title: Idioma.t("Archivos"), version: "1.0.0", enabled: true },
{ id: "keys", title: Idioma.t("Atajos"), version: "1.0.0", enabled: true },
{ id: "windows", title: Idioma.t("Ventanas"), version: "1.0.0", enabled: true },
{ id: "session", title: Idioma.t("Sesión"), version: "1.0.0", enabled: true },
{ id: "captura", title: Idioma.t("Captura"), version: "1.0.0", enabled: true }
]

signal cambiado(string id, bool habilitado)
Expand Down
4 changes: 2 additions & 2 deletions services/Settings.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,8 +506,8 @@ Singleton {
return { codigo: s.nombre, nombre: s.etiqueta }
}))
if (de === "codecs")
return [{ codigo: "h264", nombre: "H.264" },
{ codigo: "hevc", nombre: "HEVC" }]
return [{ codigo: "h264", nombre: Idioma.t("H.264") },
{ codigo: "hevc", nombre: Idioma.t("HEVC") }]
if (de === "fps")
return [{ codigo: 30, nombre: "30" },
{ codigo: 60, nombre: "60" }]
Expand Down
2 changes: 1 addition & 1 deletion tools/textos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
NO_TEXTO = ("id", "source", "command", "target", "path", "icono", "glifo",
"tipo", "efecto", "forma", "clase", "hueco", "sprite", "color",
"de", "requiere", "afinidad", "codigo", "reto", "valor", "etiqueta",
"family", "objectName", "sufijo", "prefijo")
"family", "objectName", "sufijo", "prefijo", "campo")

RE_ABRE = re.compile(r'\b(' + "|".join(PROPIEDADES) + r')\s*:')
RE_ANTES = re.compile(r'\b(' + "|".join(NO_TEXTO) + r')\s*:\s*$')
Expand Down
6 changes: 3 additions & 3 deletions traducciones/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,6 @@
"Sombra": "Shadow",
"Sonoridad de YouTube": "YouTube loudness",
"Transición en los cortes": "Transition at the cuts",
"colorFondo": "colorFondo",
"los puntos del vídeo y los rombos del bloque se arrastran · clic derecho quita": "drag the dots on the video and the diamonds on the block · right-click removes",
"Sistema al día": "System up to date",
"La actualización falló": "The update failed",
Expand Down Expand Up @@ -1041,7 +1040,7 @@
"Un momento…": "One moment…",
"Usa el ordenador: el huevo rompe andando": "Use the computer: the egg hatches as you go",
"Usuario": "User",
"V / ": "V / ",
"V / ": "W / ",
"VS": "VS",
"Velocidad (más alto = más rápido)": "Speed (higher = faster)",
"Ventana": "Window",
Expand Down Expand Up @@ -1430,5 +1429,6 @@
"No se ha podido ir a esa ventana": "Could not switch to that window",
"Todas las ventanas sobre un plano": "Every window on one plane",
"Rueda al revés": "Invert the wheel",
"Acercarse girando hacia abajo en vez de hacia arriba": "Scroll down to zoom in instead of up"
"Acercarse girando hacia abajo en vez de hacia arriba": "Scroll down to zoom in instead of up",
"D": "L"
}
2 changes: 1 addition & 1 deletion traducciones/plantilla.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,7 @@
"Cómo ocupa el sitio": "",
"Cómo ocupa el sitio el dock": "",
"Cósmico": "",
"D": "",
"Da": "",
"Danza de aceros": "",
"Danza de sombras": "",
Expand Down Expand Up @@ -1246,7 +1247,6 @@
"clic captura lo señalado · arrastra para recortar · tab recorre · esc cancela": "",
"coger varios": "",
"color": "",
"colorFondo": "",
"columna": "",
"combate": "",
"commit ": "",
Expand Down
4 changes: 2 additions & 2 deletions traducciones/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,6 @@
"Sombra": "Тень",
"Sonoridad de YouTube": "Громкость YouTube",
"Transición en los cortes": "Переход на стыках",
"colorFondo": "цветФона",
"los puntos del vídeo y los rombos del bloque se arrastran · clic derecho quita": "точки на видео и ромбы на блоке можно перетаскивать · правый клик удаляет",
"Sistema al día": "Система обновлена",
"La actualización falló": "Сбой обновления",
Expand Down Expand Up @@ -1430,5 +1429,6 @@
"No se ha podido ir a esa ventana": "Не удалось перейти к этому окну",
"Todas las ventanas sobre un plano": "Все окна на одной плоскости",
"Rueda al revés": "Инвертировать колёсико",
"Acercarse girando hacia abajo en vez de hacia arriba": "Приближать колёсиком вниз, а не вверх"
"Acercarse girando hacia abajo en vez de hacia arriba": "Приближать колёсиком вниз, а не вверх",
"D": "D"
}
2 changes: 1 addition & 1 deletion widgets/RejillaFondos.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ ColumnLayout {
anchors.centerIn: parent
textFormat: Text.PlainText
text: /\.(gif|apng)$/i.test(wallCell.modelData)
? "GIF" : Idioma.t("vídeo")
? Idioma.t("GIF") : Idioma.t("vídeo")
color: Theme.ink
font.pixelSize: 8
font.weight: Font.DemiBold
Expand Down