From 919c6c40e2bb7d7e86bb9d091e37be62afb2b6e9 Mon Sep 17 00:00:00 2001 From: Cutls Date: Thu, 3 Oct 2019 02:14:22 +0900 Subject: [PATCH 1/9] Fix: when acct-sel, not showing current acct prof img --- app/js/post/post.js | 1 + app/js/post/status.js | 2 ++ app/js/post/use-txtbox.js | 2 ++ 3 files changed, 5 insertions(+) diff --git a/app/js/post/post.js b/app/js/post/post.js index 86fcb44e..b76a40cf 100644 --- a/app/js/post/post.js +++ b/app/js/post/post.js @@ -289,6 +289,7 @@ function clear() { $("#post-acct-sel").val(localStorage.getItem("main")); } $('select').formSelect(); + mdCheck() $("#left-side").show(); $("#default-emoji").show(); $("#unreact").show(); diff --git a/app/js/post/status.js b/app/js/post/status.js index b84fa992..445bf75f 100644 --- a/app/js/post/status.js +++ b/app/js/post/status.js @@ -295,7 +295,9 @@ function redraft(id, acct_id) { show(); del(id, acct_id); $("#post-acct-sel").prop("disabled", true); + $("#post-acct-sel").val(acct_id); $('select').formSelect(); + mdCheck() var medias = $("[toot-id=" + id + "]").attr("data-medias"); var vismode = $("[toot-id=" + id + "] .vis-data").attr("data-vis"); vis(vismode); diff --git a/app/js/post/use-txtbox.js b/app/js/post/use-txtbox.js index 50c5779e..97350115 100644 --- a/app/js/post/use-txtbox.js +++ b/app/js/post/use-txtbox.js @@ -16,6 +16,7 @@ function re(id, ats_cm, acct_id, mode) { $("#post-acct-sel").val(acct_id); $("#post-acct-sel").prop("disabled", true); $('select').formSelect(); + mdCheck() $("#textarea").attr("placeholder", lang.lang_usetxtbox_reply); $("#textarea").focus(); var profimg = localStorage.getItem("prof_" + acct_id); @@ -75,5 +76,6 @@ function qt(id, acct_id, at, url) { } $("#post-acct-sel").val(acct_id); $('select').formSelect(); + mdCheck() $("#textarea").focus(); } \ No newline at end of file From 561b3a594b5e8b8bed52fc113ab9ff9111529b57 Mon Sep 17 00:00:00 2001 From: Cutls Date: Fri, 4 Oct 2019 23:39:59 +0900 Subject: [PATCH 2/9] Delete files --- .gitignore | 1 + app/view/es-AR/acct.html | 177 ----- app/view/es-AR/index.html | 1185 --------------------------------- app/view/es-AR/setting.html | 502 -------------- app/view/es-AR/setting.vue.js | 566 ---------------- app/view/es-AR/update.html | 254 ------- 6 files changed, 1 insertion(+), 2684 deletions(-) delete mode 100644 app/view/es-AR/acct.html delete mode 100644 app/view/es-AR/index.html delete mode 100644 app/view/es-AR/setting.html delete mode 100644 app/view/es-AR/setting.vue.js delete mode 100644 app/view/es-AR/update.html diff --git a/.gitignore b/.gitignore index c4bca7c2..c3b45f3c 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ app/view/de app/view/bg app/view/cs app/view/ps +app/view/es-AR app/git diff --git a/app/view/es-AR/acct.html b/app/view/es-AR/acct.html deleted file mode 100644 index fe1bc98d..00000000 --- a/app/view/es-AR/acct.html +++ /dev/null @@ -1,177 +0,0 @@ - - - - - Account Manager - TheDesk - - - - - - - - - - - - - - - - - - - - - - -
- Volver
-
Lista de cuentas
-
-
-
-
-
Agregar una cuenta

-
-
-
- -
- No seleccionar para saltar el pegado de código (iniciá sesión de Mastodon en Windows o macOS) (Recomendado: pcheck)
- -
-
-
-
-
- Supports -
-
-
-
- - -
-
-
Establecer una cuenta
-
Seleccionar una cuenta -
- - -
- Some instance data by instances.social API
-
- Administered by:
-
-
-
- Dominio:
- Servidores federados:
- Toots:
- Usuarios:Usuarios
- Conectividad:%
- Versión de Mastodon:@
-
- - - - - - - \ No newline at end of file diff --git a/app/view/es-AR/index.html b/app/view/es-AR/index.html deleted file mode 100644 index 48e4105a..00000000 --- a/app/view/es-AR/index.html +++ /dev/null @@ -1,1185 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -
- - -
-

Guía de bienvenida

- Mirá en la parte inferior de esta ventana. Acá tenés algunas sugerencias. -
- - -

- account_circle: Administrador de cuentas
　　Agregá más cuentas y administralas.
- settings: Configuración
　　Muchas configuraciones. ¡No vas a poder con todas!
- remove_from_queue: TheDesk Nano El Mastodon más pequeño,
　　Miniventana (experimental)
- apps: @@menu@@
　　@@menuDesc@@
-
- -
-
- -
-
Arrastrá y soltá acá para subir -
- -
-
-
-
-
Publicar nuevoReaction
- -
-
- -
- - - -
-
- -
- - cancel - - -
-
-
- format_bold - format_italic - format_underlined - strikethrough_s - format_quote - short_text - code - format_list_bulleted - format_list_numbered - - - autorenew - flare - swap_vert - swap_horiz - - Markdownエディタを隠す - -
- format_size - px - color_lens - -
- link -   - -
- image -   - -
-
-
-
-
- - Edit - -
-
- - - -
- - Preview - - - Markdownエディタを表示 - -
-
- visibility_off - public - CW - photo_library - tag_faces - more_vert - clear -
-
-
-
- Responder: - No/Adjuntar archivos: - Ninguno/Encuesta:No - public - -
- -
Publicar el
2.7.0~ Intervalo mínimo: 5 minutos (el reloj en el servidor podría no ser preciso).
- -
-
-
- - - - - - - - - -
-
- - -
-
-
-
- -
- - Refrescar lista de emojis -
- -
-
-
- - / - - -
- -
- -
-
- - - - - - - día/s - hora/s - minuto/s -
-
-
-
- - - - - - - - - - - -
- chevron_right　 - expand_less　 - close -
-
-
- - -
- -
-
- - -
-
-
- - -
-
-
- -
- -
-
- - -
-
- -
-
-
ご支援いただけませんか？
- (これは支援の有無に関わらず定期的に出ます。)
- あなたのMastodon, Misskeyライフを邪魔してしまって申し訳ありません。
- 乞食のようなマネをしてご支援をお願いするのもどうかと思いますが、少々お時間をください。
- ご安心ください。インターネット上のフリー百科事典のような高圧的支援要求はいたしません。コーヒーも要求いたしません。
- あなたはMastodon, MisskeyクライアントにTheDeskを選びました。これは奇跡的なことです。今考えればブラウザからアクセスした方が良かったのではと感じることかと存じます。
- それでも、あなたはTheDeskを使っています。
- TheDeskは2018年1月13日に最初のバージョンが出ました。それから圧倒的な機能数でゴリ押しするクライアントになっています。
- 新機能に追従を図るためのモチベーションもさることながら、安全対策上TheDeskは開発者の緊急メッセージを表示できる機能が備わっており、開発者が送信ボタンを押すとすべてのTheDeskユーザーに通知が行くようになっています。
- かつてこれによってバグ報告を行い、使用を自粛していただくこともありました。
- そのような機能を実装するために、Mastodonなどのインスタンスを運営するのと同じく有料のサーバーを運用しています。
- 全てのユーザーが安心してTheDeskを使っていただける環境のためにも、ぜひご支援をご検討ください。
- TheDesk no tiene publicidad, no tenés que pagar para desbloquear características premium. ¡Pero necesitamos de tu sincero apoyo! -
-
-
Support me
- It may disturb your Mastodon life, but your support is required to keep TheDesk awesome!
- TheDesk no tiene publicidad, no tenés que pagar para desbloquear características premium. ¡Pero necesitamos de tu sincero apoyo! -
- -
-
Una vez
- - Lista de deseos de Amazon - -
- Doname una tarjeta de regalo de Amazon:web-pro@cutls.com
- Kyash
-
-
-
- -
-
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/view/es-AR/setting.html b/app/view/es-AR/setting.html deleted file mode 100644 index 94a62cb5..00000000 --- a/app/view/es-AR/setting.html +++ /dev/null @@ -1,502 +0,0 @@ - - - - - Settings - TheDesk - - - - - - - - - - - - - - - - - - - - - -

Configuración

- -
- undoVolver -
-
Atajos del teclado -
  • Ctrl+1-9:Saltar a columna (1 a 9)
    • -
  • N:Abrir caja de toot
    • -
  • X:Activar caja de toot
    • -
  • Ctrl+Enter:Enviar entrada
    • -
  • Ctrl+Enter+Shift:Enviar entrada (toot secundario)
    • -
  • Alt+Enter:Botón de toot secundario
    • -
  • Ctrl+E:Marcar todas las notificaciones como leídas
    • -
  • Ctrl+U:Seleccionar el toot de la primera columna
    • -
  • Esc:Ocultar caja de toot
    • -
  • F5:Refresco masivo
    • -
  • Ctrl+Shift+C:Limpiar caja de toot
    • -
  • Ctrl+Shift+S:Configuración
    • -
  • Ctrl+Shift+M:Administrador de cuentas
    • -
  • Ctrl+Shift+N:NowPlaying(Spotify)
    • -
  • Ctrl+Shift+P:Mostrar perfil de lo seleccionado
    • -
  • ←/→:Mostrar imagen siguiente o anterior
    • -
  • Ruedadelratón:Acercar o alejar una imagen
    • -
    - 以下Markdownに対応したインスタンスのみ。 -
    -
  • Ctrl+B/I/S/U:太字/斜字/取り消し/下線
    • - 以下アスタルテにログインしている場合のみ -
    -
  • Ctrl+R: - アスタルテ暇人ランキングを開く -

    • - Al seleccionar un toot: -
  • F:Marcar como favorito
    • -
  • B:Retootear
    • -
  • R:Responder a ese toot
    • -
    -

    - - webSitio web - trending_upContribuciones (Pixiv FANBOX) - trending_upContribuciones (Patreon) - trending_upContribuciones (Liberapay) - listAyuda/Docs - GitHub - Main author: Cutls@cutls.com -
    - TheDesk @ 47c6454c00bec1d79ec0cd2fbd84cc97988f5c2b
    -
    - Kyash
    -
    - Buscar actualizaciones
    - OSS License
    -
    - Copyright © TheDesk 2018 - Under GNU General Public License v3.0 and Privacy - Policy -
    -
    - TheDeskおよびCutls Pは被災地支援のためのマストドン研究会をログイン機能提供等の形で応援しています。
    - タグタイムラインを開く:#被災地支援のためのマストドン研究会
    - - - - - - - - - - \ No newline at end of file diff --git a/app/view/es-AR/setting.vue.js b/app/view/es-AR/setting.vue.js deleted file mode 100644 index 3cbc5529..00000000 --- a/app/view/es-AR/setting.vue.js +++ /dev/null @@ -1,566 +0,0 @@ -var yesno = [ - { - text: "Sí", - value: "yes" - }, { - text: "No", - value: "no" - } -]; -var sound = [ - { - text: "Ninguno", - value: "none" - }, { - text: "Predeterminado", - value: "default" - }, { - text: "Custom 1", - value: "c1" - }, { - text: "Custom 2", - value: "c2" - }, { - text: "Custom 3", - value: "c3" - }, { - text: "Custom 4", - value: "c4" - } -]; -var envConstruction = [ - { - id: "popup", - storage: "popup", - checkbox: false, - doubleText: false, - setValue: 0, - width: 50, - text: { - head: "Ventana emergente de notificaciones (en Windows)", - desc: "Establecer \"0\" para ocultar", - after: "seg." - } - }, { - id: "notf", - storage: "nativenotf", - checkbox: true, - setValue: "yes", - text: { - head: "Notificación nativa", - desc: "Esto no funciona en la compilación portátil para Windows.", - checkbox: yesno - } - }, { - id: "width", - storage: "width", - checkbox: false, - doubleText: false, - width: 50, - setValue: 300, - text: { - head: "Ancho mínimo de las columnas", - desc: "La barra de desplazamiento se mostrará cuando el tamaño de la ventana sea mayor que el de las columnas.", - after: "px por encima" - } - }, { - id: "fixwidth", - storage: "fixwidth", - checkbox: false, - doubleText: false, - setValue: 300, - width: 50, - text: { - head: "Ancho mínimo del explorador de TweetDeck", - desc: "", - after: "px por encima" - } - }, { - id: "size", - storage: "size", - checkbox: false, - doubleText: false, - width: 50, - setValue: 13, - text: { - head: "Tamaño de tipografía", - desc: "13px(valor absoluto)", - after: "px" - } - }, { - id: "ha", - storage: "ha", - checkbox: true, - setValue: false, - text: { - head: "Deshabilitar la aceleración por hardware", - desc: "Inicio automático", - checkbox: [ - { - text: "Sí", - value: "true" - }, { - text: "No", - value: "false" - } - ] - } - } -]; -var tlConstruction = [ - { - id: "time", - storage: "datetype", - checkbox: true, - setValue: "absolute", - text: { - head: "Formato del tiempo", - desc: "Formato relativo: \"hace 1 minuto\", \"hace 3 días\"
    Formato absoluto: \"14:30:00\", \"2019/12/31 23:59:59\"
    Formato mezclado: los toots de hoy son relativos y el resto, absoluto.", - checkbox: [ - { - text: "Relativo", - value: "relative" - }, { - text: "Absoluto", - value: "absolute" - }, { - text: "Ambos", - value: "double" - }, { - text: "Mezclados", - value: "medium" - } - - ] - } - }, { - id: "ul", - storage: "locale", - checkbox: true, - setValue: "yes", - text: { - head: "Localización única del servidor", - desc: "Este valor está disponible en algunos servidores japoneses", - checkbox: yesno - } - }, { - id: "nsfw", - storage: "nsfw", - checkbox: true, - setValue: "yes", - text: { - head: "Ocultar imágenes explícitas", - desc: "Efecto difumado", - checkbox: yesno - } - }, { - id: "cw", - storage: "cw", - checkbox: true, - setValue: "yes", - text: { - head: "Ocultar contenidos con advertencias", - desc: "", - checkbox: yesno - } - }, { - id: "rp", - storage: "replyct", - checkbox: true, - setValue: "hidden", - text: { - head: "Estilo de conteo de respuestas", - desc: "", - checkbox: [ - { - text: "Mostrar \"1+\" si hay más de 1 respuesta.", - value: "hidden" - }, { - text: "Mostrat el conteo total (1, 2,…)", - value: "all" - } - - ] - } - }, { - id: "gif", - storage: "gif", - checkbox: true, - setValue: "yes", - text: { - head: "Animación de GIF", - desc: "", - checkbox: yesno - } - }, { - id: "tag", - storage: "tag-range", - checkbox: true, - setValue: "local", - text: { - head: "Búsqueda de línea temporal", - desc: "", - checkbox: [ - { - text: "Usar red federada", - value: "all" - }, { - text: "Usar red local", - value: "local" - } - - ] - } - }, { - id: "via", - storage: "viashow", - checkbox: true, - setValue: "no", - text: { - head: "Mostrar nombre del cliente de Mastodon", - desc: "", - checkbox: yesno - } - }, { - id: "mov", - storage: "mouseover", - checkbox: true, - setValue: "no", - text: { - head: "Ocultar los botones de acción sin pasada del ratón", - desc: "Podrías sentir que la pasada del ratón es incómoda :(", - checkbox: [ - { - text: "Pasar el ratón para mostrar", - value: "yes" - }, { - text: "Hacé clic para mostrar", - value: "click" - }, { - text: "No", - value: "no" - } - - ] - } - }, { - id: "notfm", - storage: "setasread", - checkbox: true, - setValue: "yes", - text: { - head: "Mostrar marcador de notificaciones, campara roja y contador (en una columna de notificaciones).", - desc: "", - checkbox: yesno - } - }, { - checkbox: false, - doubleText: true, - data: [ - { - id: "sentence", - storage: "sentence", - width: 50, - setValue: 500, - text: { after: "líneas por encima o" } - }, { - id: "letters", - storage: "letters", - width: 50, - setValue: 7000, - text: { after: "letras por encima" } - } - ], - text: { - head: "Colapsar automáticamente", - desc: "TheDesk no colapsa toots de 5 caracteres o menos. Al colapsar, no se muestran las nuevas líneas. TheDesk sólo cuenta las líneas por cantidad.", - } - }, { - id: "img-height", - storage: "img-height", - checkbox: false, - doubleText: false, - width: 80, - setValue: 200, - text: { - head: "Altura de imagen", - desc: "Opcional: establecé \"toda\" para no cortarla.", - after: "px" - } - }, { - id: "ticker", - storage: "ticker_ok", - checkbox: true, - setValue: "no", - text: { - head: "Habilitar #InstanceTicker", - desc: "Mostrar stickers coloridos sobre el servidor. Acerca de #InstanceTicker, derechos de autor 2018 weepjo, kyori19.", - checkbox: yesno - } - }, { - id: "anime", - storage: "animation", - checkbox: true, - setValue: "yes", - text: { - head: "Animación de líneas temporales", - desc: "", - checkbox: yesno - } - }, { - id: "markers", - storage: "markers", - checkbox: true, - setValue: "no", - text: { - head: "Marcadores (marcar como leído) en línea temporal principal y notificaciones", - desc: "Mastodon 3.0~. Compartido en interface web y clientes de terceros soportados.", - checkbox: yesno - } - }, { - id: "replySound", - storage: "replySound", - checkbox: true, - setValue: "none", - text: { - head: "Sonido (respuesta)", - desc: "", - checkbox: sound - } - }, { - id: "favSound", - storage: "favSound", - checkbox: true, - setValue: "none", - text: { - head: "Sonido (marcado como favorito)", - desc: "", - checkbox: sound - } - }, { - id: "btSound", - storage: "btSound", - checkbox: true, - setValue: "none", - text: { - head: "Sonido (retoot)", - desc: "", - checkbox: sound - } - }, { - id: "followSound", - storage: "followSound", - checkbox: true, - setValue: "none", - text: { - head: "Sonido (nuevo seguidor)", - desc: "", - checkbox: sound - } - } -]; -var postConstruction = [ - { - id: "cw-text", - storage: "cw-text", - checkbox: false, - doubleText: false, - width: 150, - setValue: "", - text: { - head: "Texto de advertencia predeterminado", - desc: "", - after: "" - } - }, { - checkbox: false, - doubleText: true, - data: [ - { - id: "cw_sentence", - storage: "cw_sentence", - width: 50, - setValue: 500, - text: { after: "líneas por encima o" } - }, { - id: "cw_letters", - storage: "cw_letters", - width: 50, - setValue: 7000, - text: { after: "letras por encima" } - } - ], - text: { - head: "Alertar antes de enviar un toot largo.", - desc: "Mostrar un diálogo si estás escribiendo un texto oculto demasiado largo.", - } - }, { - id: "cws", - storage: "always-cw", - checkbox: true, - setValue: "no", - text: { - head: "Siempre establecer advertencia de contenido", - desc: "", - checkbox: yesno - } - }, { - id: "vis", - storage: "vis", - checkbox: true, - setValue: "public", - text: { - head: "Visibilidad predeterminada", - desc: "", - checkbox: [ - { - text: "Pública", - value: "public" - }, { - text: "No listada", - value: "unlisted" - }, { - text: "Privada", - value: "private" - }, { - text: "Mensaje directo", - value: "direct" - }, { - text: "Memoria (en cada servidor)", - value: "memory" - }, { - text: "Visibilidad predeterminada (se establece en la configuración del servidor de Mastodon)", - value: "useapi" - } - ] - } - }, { - id: "img", - storage: "img", - checkbox: true, - setValue: "no-act", - text: { - head: "Configuración al enviar imágenes", - desc: "", - checkbox: [ - { - text: "Dirección web para adjuntar medios", - value: "url" - }, { - text: "No adjuntar nada", - value: "no-act" - } - ] - } - }, { - id: "box", - storage: "box", - checkbox: true, - setValue: "yes", - text: { - head: "Comportamiento de la caja de entradas", - desc: "", - checkbox: [ - { - text: "Colapsar", - value: "yes" - }, { - text: "Abrir luego de enviar la entrada", - value: "no" - }, { - text: "Absolutamente abierta", - value: "absolute" - } - ] - } - }, { - id: "quote", - storage: "quote", - checkbox: true, - setValue: "nothing", - text: { - head: "Formato de cita", - desc: "", - checkbox: [ - { - text: "Sólo dirección web", - value: "simple" - }, { - text: "Dirección web y cuenta (mención al usuario)", - value: "mention" - }, { - text: "Dirección web, texto y cuenta (mención al usuario)", - value: "full" - }, { - text: "API (sólo algunas instancias)", - value: "apiQuote", - quote: true - }, { - text: "Deshabilitado (ocultar botones en las líneas temporales)", - value: "nothing" - } - ] - } - }, { - id: "main", - storage: "mainuse", - checkbox: true, - setValue: "remain", - text: { - head: "Acciones de cuenta predeterminada", - desc: "Se puede establecer la cuenta predeterminada en el Administrador de cuentas.", - checkbox: [ - { - text: "Cuenta usada recientemente", - value: "remain" - }, { - text: "Cuenta principal", - value: "main" - } - ] - } - }, { - id: "sec", - storage: "sec", - checkbox: true, - setValue: "public", - text: { - head: "Botón de toot secundario", - desc: "", - checkbox: [ - { - text: "Oculto", - value: "nothing" - }, { - text: "Pública", - value: "public" - }, { - text: "No listada", - value: "unlisted" - }, { - text: "Privada", - value: "private" - }, { - text: "Mensaje directo", - value: "direct" - }, { - text: "Sólo local", - value: "local", - kirishima: true, - kirishimaText: "非対応インスタンスでは「未収載」になります。" - } - ] - } - }, { - id: "zero", - storage: "emoji-zero-width", - checkbox: true, - setValue: "normal", - setValue: "no", - text: { - head: "No agregar espacio al insertar emojis", - desc: "", - checkbox: yesno - } - } -] diff --git a/app/view/es-AR/update.html b/app/view/es-AR/update.html deleted file mode 100644 index 80aa59e0..00000000 --- a/app/view/es-AR/update.html +++ /dev/null @@ -1,254 +0,0 @@ - - - - - Update - TheDesk - - - - - - - - - - - - info - clear - -
    -
    -

    TheDesk

    -

    Obtené la última versión de TheDesk

    - →
    -
    - - - - -
    - ¿Tenés problemas?
    Por favor, descargá desde el sitio web oficial. -
    -
    -

    ¡Podrías perderte una experiencia copada!

    - Saltar esta actualización
    - - Continuar con la actualización -
    -
    -

    Descargando…

    -

    -
    -
    -
    -
    -
    - - - \ No newline at end of file From 5d61b83c50d94c8615a7e0d0043e0946ca655d88 Mon Sep 17 00:00:00 2001 From: Cutls Date: Fri, 4 Oct 2019 23:43:03 +0900 Subject: [PATCH 3/9] Update Crowdin configuration file --- crowdin.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 crowdin.yml diff --git a/crowdin.yml b/crowdin.yml new file mode 100644 index 00000000..d5b13722 --- /dev/null +++ b/crowdin.yml @@ -0,0 +1,5 @@ +files: + - source: /app/view/make/language/en/*.json + translation: /app/view/make/language/%language%/*.json + - source: /app/js/lang/lang.en.json + translation: /app/js/lang/lang.%language%.json From 376847b489937621e8b0acfc3a500318ebfa14b6 Mon Sep 17 00:00:00 2001 From: Cutls Date: Fri, 4 Oct 2019 23:54:24 +0900 Subject: [PATCH 4/9] Update Crowdin configuration file --- crowdin.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/crowdin.yml b/crowdin.yml index d5b13722..172ad285 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,5 +1,3 @@ files: - source: /app/view/make/language/en/*.json translation: /app/view/make/language/%language%/*.json - - source: /app/js/lang/lang.en.json - translation: /app/js/lang/lang.%language%.json From e9cc2d0e529fbaa2dd668da7da9bbc57d77be522 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 5 Oct 2019 00:07:15 +0900 Subject: [PATCH 5/9] Change: locales --- app/js/lang/json5Tojson.js | 3 -- app/view/make/acct.sample.html | 2 +- app/view/make/index.sample.html | 2 +- .../make/language/bg/main.json} | 2 +- .../make/language/cs/main.json} | 2 +- .../make/language/de/main.json} | 2 +- .../make/language/en/main.json} | 36 +------------ .../make/language/es-AR/main.json} | 2 +- .../make/language/ja/main.json} | 36 +------------ .../make/language/ps/main.json} | 54 +++++++++++++++++-- app/view/make/make.js | 1 + app/view/make/setting.sample.html | 2 +- 12 files changed, 61 insertions(+), 83 deletions(-) delete mode 100644 app/js/lang/json5Tojson.js rename app/{js/lang/lang.bg.js => view/make/language/bg/main.json} (99%) rename app/{js/lang/lang.cs.js => view/make/language/cs/main.json} (99%) rename app/{js/lang/lang.de.js => view/make/language/de/main.json} (99%) rename app/{js/lang/lang.en.js => view/make/language/en/main.json} (94%) rename app/{js/lang/lang.es-AR.js => view/make/language/es-AR/main.json} (99%) rename app/{js/lang/lang.ja.js => view/make/language/ja/main.json} (96%) rename app/{js/lang/lang.ps.js => view/make/language/ps/main.json} (81%) diff --git a/app/js/lang/json5Tojson.js b/app/js/lang/json5Tojson.js deleted file mode 100644 index 59a20745..00000000 --- a/app/js/lang/json5Tojson.js +++ /dev/null @@ -1,3 +0,0 @@ -const JSON5 = require('json5') -const fs = require("fs") -fs.writeFileSync("main.json", JSON.stringify(JSON5.parse(fs.readFileSync("lang." + process.argv[2] + ".js", 'utf8').replace("var lang = ", "")))) \ No newline at end of file diff --git a/app/view/make/acct.sample.html b/app/view/make/acct.sample.html index 473c04fa..fe1c1ffc 100644 --- a/app/view/make/acct.sample.html +++ b/app/view/make/acct.sample.html @@ -89,7 +89,7 @@ - + - + diff --git a/app/js/lang/lang.bg.js b/app/view/make/language/bg/main.json similarity index 99% rename from app/js/lang/lang.bg.js rename to app/view/make/language/bg/main.json index 616fbd10..1c32266c 100644 --- a/app/js/lang/lang.bg.js +++ b/app/view/make/language/bg/main.json @@ -1,4 +1,4 @@ -var lang={ +{ "language": "en", "lang_toot": "Раздумай", "lang_there": "Да", diff --git a/app/js/lang/lang.cs.js b/app/view/make/language/cs/main.json similarity index 99% rename from app/js/lang/lang.cs.js rename to app/view/make/language/cs/main.json index f6247533..2f3821be 100644 --- a/app/js/lang/lang.cs.js +++ b/app/view/make/language/cs/main.json @@ -1,4 +1,4 @@ -var lang={ +{ "language": "cs", "lang_toot": "Toot", "lang_there": "Ano", diff --git a/app/js/lang/lang.de.js b/app/view/make/language/de/main.json similarity index 99% rename from app/js/lang/lang.de.js rename to app/view/make/language/de/main.json index 07a01a95..38841751 100644 --- a/app/js/lang/lang.de.js +++ b/app/view/make/language/de/main.json @@ -1,4 +1,4 @@ -var lang={ +{ "language": "en", "lang_toot": "Tröt", "lang_there": "Ja", diff --git a/app/js/lang/lang.en.js b/app/view/make/language/en/main.json similarity index 94% rename from app/js/lang/lang.en.js rename to app/view/make/language/en/main.json index cd580d75..f265fb6e 100644 --- a/app/js/lang/lang.en.js +++ b/app/view/make/language/en/main.json @@ -1,5 +1,4 @@ -//commonError -var lang = { +{ "language": "en", "lang_toot": "Toot", "lang_there": "Yes", @@ -12,13 +11,11 @@ var lang = { "lang_add": "Add", "lang_fatalerroroccured": "Some errors are occured, please restart TheDesk.", "lang_speech": "Google US English", - //language.html "lang_lang": "Language", "lang_langlocale": "English", "lang_back": "Back", "lang_set": "Set", "lang_langadd": "Translate TheDesk to other languages or proofread TheDesk on GitHub. TheDesk needs your help.", - //common/time.js "lang_time_prefixAgo": null, "lang_time_prefixFromNow": null, "lang_time_suffixAgo": null, @@ -35,16 +32,12 @@ var lang = { "lang_time_months": "%d months", "lang_time_year": "y", "lang_time_years": "%d y", - //common/version.js "lang_version_usever": "No update is found({{ver}})", "lang_version_skipver": "Update was ignored.", "lang_version_platform": "Do you want auto-updates?(users installed on Microsoft Store select 'No')", "lang_version_platform_linux": "Do you want auto-updates?(users installed on Snapcraft select 'No')", "lang_version_platform_mac": "Do you want auto-updates?(Homebrew Cask users select 'No')", - //login - //login/login.js "lang_login_noauth": "Show TL of unlogined accounts", - //login/manager.js "lang_manager_info": "About this instance", "lang_manager_refresh": "Refresh", "lang_manager_delete": "Logout", @@ -55,19 +48,15 @@ var lang = { "lang_manager_none": "None", "lang_manager_godev": "Open DevCenter of Misskey. We show also an official documents to refer.", "lang_manager_logout": "Logout", - //post/bb-md.js "lang_bbmd_misskey": "TheDesk regards \"@\" as reply, but put other parameter. Unlisted on Mastodon means Home on Misskey.", - //post/emoji.js "lang_emoji_get": "Get emojis", "lang_emoji_custom": "Custom emojis", "lang_defaultemojis_text": "Emojis about {{cat}}", "lang_emoji_uncat": "Uncategorized", - //post/img.js "lang_postimg_previewdis": "cannot preview", "lang_postimg_aftupload": "You cannot change accounts after uploading.", "lang_postimg_failupload": "Failed", "lang_postimg_delete": "Delete this image.", - //post/post.js "lang_post_tagTL": "This toot does not contain a default tag. This toot will not be shown on Local TL. Continue?", "lang_post_tagVis": "This toot(not 'public' toot) is not shown on this tag's TL.", "lang_post_cwtitle": "Auto CW Alert", @@ -75,7 +64,6 @@ var lang = { "lang_post_btn1": "Cancel (will not post)", "lang_post_btn2": "Make text hidden automatically", "lang_post_btn3": "Continue to post", - //post/status.js "lang_status_favWarn": "It will take a miunte to favourite a remote toot.", "lang_status_btWarn": "It will take a miunte to boost a remote toot.", "lang_status_follow": "Follow", @@ -92,23 +80,17 @@ var lang = { "lang_status_endorse": "Feature on profile", "lang_status_followers": "Followers", "lang_status_active": "Last status", - //post/suggest.js "lang_suggest_nodata": "Please get emojis list in order to show suggestion.", - //post/use-txtbox.js "lang_usetxtbox_reply": "Reply Mode. Ctrl+Shift+C to clear.", - //tl/card.js "lang_cards_check": " check", "lang_cards_pip": "PiP mode", - //tl/details.js "lang_details_nodata": "No data", "lang_details_filtered": "Filtered toot", "lang_details_embed": "Embed HTML is cliped.", "lang_details_url": "URL of this toot is cliped.", "lang_details_txt": "Content of this toot is cliped.", - //tl/filter.js "lang_filter_nodata": "No data", "lang_filter_errordegree": "Please check a context", - //tl/list.js "lang_list_nodata": "No data", "lang_list_show": "Show", "lang_list_users": "Users list", @@ -116,27 +98,20 @@ var lang = { "lang_list_add": "Add to the list", "lang_list_add_misskey": "(perhaps this user has been listed)", "lang_list_remove": "Remove from the list", - //tl/notification.js "lang_notf_new": " new notifications", - //tl/speech.js "lang_speech_refresh": "Save value about TTS config", - //tl/src.js "lang_src_ts": "chronological order", "lang_src_people": " people toot", - //tl/tag.js "lang_tags_always": "Always toots with ", "lang_tags_realtime": "Tag-stream toot", "lang_tags_tagunpin": "Unpin {{tag}}", "lang_tags_unrealtime": "Disable TsT", "lang_tags_tagwarn": "Auto complete {{tag}}, if toot without {{tag}}", - //tl/tl.js "lang_tl_media": "Media", "lang_tl_reconnect": "Reconnect to streaming API", "lang_tl_postmarkers_title": "Process...", "lang_tl_postmarkers": "POST markers data. Please wait", - //ui/img.js "lang_img_DLDone": "Downloaded:", - //ui/layout.js "lang_layout_gotop": "Go top of this column. When icon is red, this column cannot connect straming API. Please reload.", "lang_layout_thisacct": "{{notf}} of this account", "lang_layout_delthis": "Remove this column", @@ -157,22 +132,18 @@ var lang = { "lang_layout_deleteColumn": "Delete this column", "lang_layout_deleteColumnDesc": "Delete this column", "lang_layout_unread": "Unread", - //ui/sort.js "lang_sort_gothis": "Go to this column", "lang_sort_remthis": "Delete this column", - //ui/spotify.js "lang_spotify_img": "Attach an album artwork", "lang_spotify_imgno": "Not attach an album artwork", "lang_spotify_acct": "Connect TheDesk to Spotify", "lang_spotify_np": "Done:templete of NowPlaying", "lang_setting_npprovide": "NowPlaying provider:{{set}}", - //userdata/his-data.js "lang_hisdata_frcreq": "Required Mastodon 2.4.3 and above", "lang_hisdata_frcwarn": "Unfollow accounts will be shown.", "lang_hisdata_taketime": "It will take 30s ~ several minutes", "lang_hisdata_notonmisskey": "Misskey is unable to request.", "lang_hisdata_key": "This user is proofed by {{set}}", - //userdata/showOnTL.js "lang_showontl_movetxt": "This account was moved", "lang_showontl_movebtn": "Continue on the new account", "lang_showontl_botacct": "[bot]", @@ -181,7 +152,6 @@ var lang = { "lang_showontl_domain": "Domain ", "lang_showontl_listwarn": "Follow to add this user to lists.", "lang_showontl_verified": "This website is verified by owner at ", - //parse "lang_parse_mentioned": " replied to you", "lang_parse_faved": " favourited your toot", "lang_parse_bted": " boosted your toot", @@ -226,7 +196,6 @@ var lang = { "lang_parse_unknown": "Attached file", "lang_parse_nsfw": "sensitive media", "lang_parse_notffilter": "Show this user's notifications", - //misskey "lang_misskeyparse_renote": "Repost", "lang_misskeyparse_renoteqt": "Renote", "lang_misskeyparse_reaction": "Reaction", @@ -239,7 +208,6 @@ var lang = { "lang_misskeyparse_renoted": " renoted your following post.", "lang_misskeyparse_quoted": " quoted your following post.", "lang_misskeyparse_reacted": " reacted your following post.", - //setting "lang_setting_time": "Time format:{{set}}", "lang_setting_theme": "Theme:{{set}}", "lang_setting_nsfw": "Sensitive media:{{set}}", @@ -279,5 +247,5 @@ var lang = { "lang_setting_notftest": " Notification test ", "lang_setting_notftestprof": "Your icon is shown.", "lang_setting_exportwarn": "Only important data will be exported. You must keep this data secure.", - "lang_setting_importwarn": "All data will be deleted.", + "lang_setting_importwarn": "All data will be deleted." } \ No newline at end of file diff --git a/app/js/lang/lang.es-AR.js b/app/view/make/language/es-AR/main.json similarity index 99% rename from app/js/lang/lang.es-AR.js rename to app/view/make/language/es-AR/main.json index c73c9406..2610b374 100644 --- a/app/js/lang/lang.es-AR.js +++ b/app/view/make/language/es-AR/main.json @@ -1,4 +1,4 @@ -var lang = { +{ "language": "es-AR", "lang_toot": "Toot", "lang_there": "Sí", diff --git a/app/js/lang/lang.ja.js b/app/view/make/language/ja/main.json similarity index 96% rename from app/js/lang/lang.ja.js rename to app/view/make/language/ja/main.json index 1dc843f7..e02b4c88 100644 --- a/app/js/lang/lang.ja.js +++ b/app/view/make/language/ja/main.json @@ -1,5 +1,4 @@ -//commonError -var lang = { +{ "language": "ja", "lang_toot": "トゥート", "lang_there": "あり", @@ -12,18 +11,16 @@ var lang = { "lang_add": "追加", "lang_fatalerroroccured": "エラーが発生しました。しばらく待ってから再起動してください。", "lang_speech": "Google 日本語", - //language.html "lang_lang": "言語", "lang_langlocale": "日本語", "lang_back": "戻る", "lang_set": "設定", "lang_langadd": "GitHubから翻訳に参加できます。英語の校正(緊急)や他言語に翻訳していただける方を募集しております。", - //common/time.js "lang_time_prefixAgo": null, "lang_time_prefixFromNow": "今から", "lang_time_suffixAgo": "", "lang_time_suffixFromNow": "", - "lang_time_inPast": '', + "lang_time_inPast": "", "lang_time_seconds": "%d秒前", "lang_time_minute": "1分前", "lang_time_minutes": "%d分前", @@ -35,16 +32,12 @@ var lang = { "lang_time_months": "%dヶ月前", "lang_time_year": "去年", "lang_time_years": "%d年前", - //common/version.js "lang_version_usever": "お使いのバージョン{{ver}}は最新です。", "lang_version_skipver": "アップデートはスキップされました。", "lang_version_platform": "このソフトウェアはMicrosoft Storeからダウンロードされましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとMicrosoft Storeからアップデートが提供され、アップデートの通知を出しません。", "lang_version_platform_linux": "このソフトウェアはSnapcraft(snapd)からインストールしましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとSnapcraftからアップデートが提供され、アップデートの通知を出しません。", "lang_version_platform_mac": "このソフトウェアはHomebrew Caskからインストールしましたか？通常はホームページからインストールするため「いいえ」を選んでください。「はい」を選ぶとアップデートの通知を出しません。", - //login - //login/login.js "lang_login_noauth": "認証せずに見る", - //login/manager.js "lang_manager_info": "インスタンス情報", "lang_manager_refresh": "情報更新", "lang_manager_delete": "削除", @@ -55,19 +48,15 @@ var lang = { "lang_manager_none": "なし", "lang_manager_godev": "MisskeyのDevセンターに移動します。同時に開かれるドキュメントを参考にログインしてください。", "lang_manager_logout": "ログアウト", - //post/bb-md.js "lang_bbmd_misskey": "TheDeskにおけるMisskeyでは、@を返信として扱いますが、全ての@は消去され別パラメータに入力されます。また、「未収載」を「ホーム」として扱います。", - //post/emoji.js "lang_emoji_get": "絵文字リストを取得", "lang_emoji_custom": "カスタム絵文字", "lang_defaultemojis_text": "{{cat}}の絵文字", "lang_emoji_uncat": "未分類", - //post/img.js "lang_postimg_previewdis": "プレビューできません。", "lang_postimg_aftupload": "アップロード後はアカウントを切り替えられません。", "lang_postimg_failupload": "アップロードに失敗しました。", "lang_postimg_delete": "この画像を削除します", - //post/post.js "lang_post_tagTL": "デフォルトタグが挿入されていません。このまま投稿するとローカルには表示されません。", "lang_post_tagVis": "公開範囲が「公開」以外だと、タグTLに表示されません。(一部インスタンスを除く)", "lang_post_cwtitle": "長文投稿の警告", @@ -75,7 +64,6 @@ var lang = { "lang_post_btn1": "キャンセル(投稿しない)", "lang_post_btn2": "自動でCWを付ける", "lang_post_btn3": "そのまま投稿", - //post/status.js "lang_status_favWarn": "お気に入り登録しました。インスタンスが違うときは時間がかかる場合があります。", "lang_status_btWarn": "ブーストしました。インスタンスが違うときは時間がかかる場合があります。", "lang_status_follow": "フォロー", @@ -92,23 +80,17 @@ var lang = { "lang_status_endorse": "プロフで紹介する", "lang_status_followers": "フォロワー", "lang_status_active": "最新トゥート", - //post/suggest.js "lang_suggest_nodata": "サジェストのために絵文字リストを取得してください。", - //post/use-txtbox.js "lang_usetxtbox_reply": "返信モードです。クリアするときはCtrl+Shift+Cを押してください。", - //tl/card.js "lang_cards_check": "チェック", "lang_cards_pip": "ながら観モード", - //tl/details.js "lang_details_nodata": "データなし", "lang_details_filtered": "フィルターされました。", "lang_details_embed": "埋め込みHTMLがコピーされました。", "lang_details_url": "トゥートURLがコピーされました。", "lang_details_txt": "トゥート本文がコピーされました。", - //tl/filter.js "lang_filter_nodata": "フィルターはありません", "lang_filter_errordegree": "適応範囲を最低一つ以上チェックしてください。", - //tl/list.js "lang_list_nodata": "リストはありません", "lang_list_show": "表示", "lang_list_users": "ユーザー一覧", @@ -116,27 +98,20 @@ var lang = { "lang_list_add": "リストに追加", "lang_list_add_misskey": "(重複追加の可能性があります)", "lang_list_remove": "リストから削除", - //tl/notification.js "lang_notf_new": "件の新しい通知", - //tl/speech.js "lang_speech_refresh": "音声読み上げ設定を更新しました。", - //tl/src.js "lang_src_ts": "時系列", "lang_src_people": "人がトゥート", - //tl/tag.js "lang_tags_always": "常に", "lang_tags_realtime": "実況", "lang_tags_tagunpin": "{{tag}}をよく使うタグから削除", "lang_tags_unrealtime": "実況解除", "lang_tags_tagwarn": "{{tag}}がない場合自動で補完されます。", - //tl/tl.js "lang_tl_media": "メディア", "lang_tl_reconnect": "Streamingに再接続しました", "lang_tl_postmarkers_title": "処理中", "lang_tl_postmarkers": "未読マーカーを送信しています。3秒以内に閉じられます。", - //ui/img.js "lang_img_DLDone": "ダウンロード先:", - //ui/layout.js "lang_layout_gotop": "一番上へ。アイコンが赤のときはストリーミングに接続できていません。F5等で再読込をお試し下さい。", "lang_layout_thisacct": "このアカウントの{{notf}}", "lang_layout_delthis": "このカラムを削除", @@ -157,22 +132,18 @@ var lang = { "lang_layout_deleteColumn": "カラム削除", "lang_layout_deleteColumnDesc": "カラムを削除しますか？", "lang_layout_unread": "未読", - //ui/sort.js "lang_sort_gothis": "このカラムへ", "lang_sort_remthis": "このカラムを削除", - //ui/spotify.js "lang_spotify_img": "アルバムアートワークを添付します。", "lang_spotify_imgno": "アルバムアートワークを添付しません。", "lang_spotify_acct": "アカウント連携をしてください。", "lang_spotify_np": "NowPlaying文書を更新しました。", "lang_setting_npprovide": "NowPlayingのソースを{{set}}に設定しました。", - //userdata/his-data.js "lang_hisdata_frcreq": "Mastodon 2.4.3~が必要です", "lang_hisdata_frcwarn": "非フォローだけど絡みがある時に表示されます。", "lang_hisdata_taketime": "30秒から数分かかります", "lang_hisdata_notonmisskey": "このシステムはMisskeyにはありません。", "lang_hisdata_key": "このユーザーの信頼性は{{set}}によって示されています", - //userdata/showOnTL.js "lang_showontl_movetxt": "このアカウントは移行しています", "lang_showontl_movebtn": "移行先を見る", "lang_showontl_botacct": "botアカウント", @@ -181,7 +152,6 @@ var lang = { "lang_showontl_domain": "ドメイン", "lang_showontl_listwarn": "リストに追加するためにはフォローが必要です。", "lang_showontl_verified": "このユーザーの所持するWebサイトであると証明されています。", - //parse "lang_parse_mentioned": "が返信しました", "lang_parse_faved": "がお気に入り登録しました", "lang_parse_bted": "がブーストしました", @@ -226,7 +196,6 @@ var lang = { "lang_parse_unknown": "添付ファイル", "lang_parse_nsfw": "閲覧注意", "lang_parse_notffilter": "このユーザーの通知のみを表示", - //misskey "lang_misskeyparse_renote": "再投稿", "lang_misskeyparse_renoteqt": "引用", "lang_misskeyparse_reaction": "リアクション", @@ -239,7 +208,6 @@ var lang = { "lang_misskeyparse_renoted": "がRepost", "lang_misskeyparse_quoted": "が引用", "lang_misskeyparse_reacted": "がリアクション", - //setting "lang_setting_time": "時間設定を{{set}}に設定しました。", "lang_setting_theme": "テーマ設定を{{set}}に設定しました。", "lang_setting_nsfw": "画像表示設定を{{set}}に設定しました。", diff --git a/app/js/lang/lang.ps.js b/app/view/make/language/ps/main.json similarity index 81% rename from app/js/lang/lang.ps.js rename to app/view/make/language/ps/main.json index 3e37a750..47c099ac 100644 --- a/app/js/lang/lang.ps.js +++ b/app/view/make/language/ps/main.json @@ -1,4 +1,4 @@ -var lang = { +{ "language": "crwdns1960:0crwdne1960:0", "lang_toot": "crwdns1962:0crwdne1962:0", "lang_there": "crwdns1964:0crwdne1964:0", @@ -16,8 +16,27 @@ var lang = { "lang_back": "crwdns1988:0crwdne1988:0", "lang_set": "crwdns1990:0crwdne1990:0", "lang_langadd": "crwdns2364:0crwdne2364:0", + "lang_time_prefixAgo": null, + "lang_time_prefixFromNow": null, + "lang_time_suffixAgo": null, + "lang_time_suffixFromNow": null, + "lang_time_inPast": null, + "lang_time_seconds": "crwdns2948:0%dcrwdne2948:0", + "lang_time_minute": "crwdns2950:0crwdne2950:0", + "lang_time_minutes": "crwdns2952:0%dcrwdne2952:0", + "lang_time_hour": "crwdns2954:0crwdne2954:0", + "lang_time_hours": "crwdns2956:0%dcrwdne2956:0", + "lang_time_day": "crwdns2958:0crwdne2958:0", + "lang_time_days": "crwdns2960:0%dcrwdne2960:0", + "lang_time_month": "crwdns2962:0crwdne2962:0", + "lang_time_months": "crwdns2964:0%dcrwdne2964:0", + "lang_time_year": "crwdns2966:0crwdne2966:0", + "lang_time_years": "crwdns2968:0%dcrwdne2968:0", "lang_version_usever": "crwdns1994:0{{ver}}crwdne1994:0", "lang_version_skipver": "crwdns1996:0crwdne1996:0", + "lang_version_platform": "crwdns2562:0crwdne2562:0", + "lang_version_platform_linux": "crwdns2564:0crwdne2564:0", + "lang_version_platform_mac": "crwdns2566:0crwdne2566:0", "lang_login_noauth": "crwdns1998:0crwdne1998:0", "lang_manager_info": "crwdns2000:0crwdne2000:0", "lang_manager_refresh": "crwdns2002:0crwdne2002:0", @@ -28,12 +47,15 @@ var lang = { "lang_manager_def": "crwdns2012:0crwdne2012:0", "lang_manager_none": "crwdns2014:0crwdne2014:0", "lang_manager_godev": "crwdns2016:0crwdne2016:0", + "lang_manager_logout": "crwdns2568:0crwdne2568:0", "lang_bbmd_misskey": "crwdns2018:0crwdne2018:0", "lang_emoji_get": "crwdns2020:0crwdne2020:0", "lang_emoji_custom": "crwdns2022:0crwdne2022:0", "lang_defaultemojis_text": "crwdns2388:0{{cat}}crwdne2388:0", "lang_postimg_previewdis": "crwdns2024:0crwdne2024:0", "lang_postimg_aftupload": "crwdns2026:0crwdne2026:0", + "lang_postimg_failupload": "crwdns2594:0crwdne2594:0", + "lang_postimg_delete": "crwdns2528:0crwdne2528:0", "lang_post_tagTL": "crwdns2028:0crwdne2028:0", "lang_post_tagVis": "crwdns2030:0crwdne2030:0", "lang_post_cwtitle": "crwdns2032:0crwdne2032:0", @@ -49,11 +71,14 @@ var lang = { "lang_status_unblock": "crwdns2052:0crwdne2052:0", "lang_status_mute": "crwdns2054:0crwdne2054:0", "lang_status_unmute": "crwdns2056:0crwdne2056:0", + "lang_status_redraftTitle": "crwdns2570:0crwdne2570:0", "lang_status_redraft": "crwdns2058:0crwdne2058:0", "lang_status_emphas": "crwdns2060:0crwdne2060:0", "lang_status_unemphas": "crwdns2062:0crwdne2062:0", "lang_status_unendorse": "crwdns2064:0crwdne2064:0", "lang_status_endorse": "crwdns2066:0crwdne2066:0", + "lang_status_followers": "crwdns2970:0crwdne2970:0", + "lang_status_active": "crwdns2972:0crwdne2972:0", "lang_suggest_nodata": "crwdns2068:0crwdne2068:0", "lang_usetxtbox_reply": "crwdns2070:0crwdne2070:0", "lang_cards_check": "crwdns2072:0crwdne2072:0", @@ -70,6 +95,7 @@ var lang = { "lang_list_users": "crwdns2094:0crwdne2094:0", "lang_list_nouser": "crwdns2096:0crwdne2096:0", "lang_list_add": "crwdns2098:0crwdne2098:0", + "lang_list_add_misskey": "crwdns2530:0crwdne2530:0", "lang_list_remove": "crwdns2100:0crwdne2100:0", "lang_notf_new": "crwdns2102:0crwdne2102:0", "lang_speech_refresh": "crwdns2348:0crwdne2348:0", @@ -78,9 +104,13 @@ var lang = { "lang_tags_always": "crwdns2110:0crwdne2110:0", "lang_tags_realtime": "crwdns2112:0crwdne2112:0", "lang_tags_tagunpin": "crwdns2114:0{{tag}}crwdne2114:0", - "lang_tags_tagwarn": "crwdns2116:0{{tag}}crwdne2116:0", + "lang_tags_unrealtime": "crwdns2532:0crwdne2532:0", + "lang_tags_tagwarn": "crwdns2534:0{{tag}}crwdnd2534:0{{tag}}crwdne2534:0", "lang_tl_media": "crwdns2118:0crwdne2118:0", "lang_tl_reconnect": "crwdns2120:0crwdne2120:0", + "lang_tl_postmarkers_title": "crwdns2974:0crwdne2974:0", + "lang_tl_postmarkers": "crwdns2976:0crwdne2976:0", + "lang_img_DLDone": "crwdns2572:0crwdne2572:0", "lang_layout_gotop": "crwdns2122:0crwdne2122:0", "lang_layout_thisacct": "crwdns2124:0{{notf}}crwdne2124:0", "lang_layout_delthis": "crwdns2126:0crwdne2126:0", @@ -89,13 +119,20 @@ var lang = { "lang_layout_linkana": "crwdns2132:0crwdne2132:0", "lang_layout_linkanades": "crwdns2134:0crwdne2134:0", "lang_layout_tts": "crwdns2136:0crwdne2136:0", - "lang_layout_reconnect": "crwdns2138:0crwdne2138:0", + "lang_layout_reconnect": "crwdns2596:0crwdne2596:0", "lang_layout_headercolor": "crwdns2140:0crwdne2140:0", "lang_layout_nodata": "crwdns2142:0crwdne2142:0", "lang_layout_dm": "crwdns2144:0crwdne2144:0", "lang_layout_webviewmode": "crwdns2146:0crwdne2146:0", "lang_excluded": "crwdns2368:0crwdne2368:0", "lang_layout_excludingbt": "crwdns2390:0crwdne2390:0", + "lang_layout_leftFold": "crwdns2536:0crwdne2536:0", + "lang_layout_leftUnfold": "crwdns2538:0crwdne2538:0", + "lang_layout_deleteColumn": "crwdns2574:0crwdne2574:0", + "lang_layout_deleteColumnDesc": "crwdns2576:0crwdne2576:0", + "lang_layout_unread": "crwdns2978:0crwdne2978:0", + "lang_sort_gothis": "crwdns2540:0crwdne2540:0", + "lang_sort_remthis": "crwdns2542:0crwdne2542:0", "lang_spotify_img": "crwdns2148:0crwdne2148:0", "lang_spotify_imgno": "crwdns2150:0crwdne2150:0", "lang_spotify_acct": "crwdns2152:0crwdne2152:0", @@ -105,6 +142,7 @@ var lang = { "lang_hisdata_frcwarn": "crwdns2158:0crwdne2158:0", "lang_hisdata_taketime": "crwdns2160:0crwdne2160:0", "lang_hisdata_notonmisskey": "crwdns2162:0crwdne2162:0", + "lang_hisdata_key": "crwdns2544:0{{set}}crwdne2544:0", "lang_showontl_movetxt": "crwdns2164:0crwdne2164:0", "lang_showontl_movebtn": "crwdns2166:0crwdne2166:0", "lang_showontl_botacct": "crwdns2168:0[bot]crwdne2168:0", @@ -112,10 +150,12 @@ var lang = { "lang_showontl_notf": "crwdns2172:0crwdne2172:0", "lang_showontl_domain": "crwdns2174:0crwdne2174:0", "lang_showontl_listwarn": "crwdns2176:0crwdne2176:0", + "lang_showontl_verified": "crwdns2546:0crwdne2546:0", "lang_parse_mentioned": "crwdns2178:0crwdne2178:0", "lang_parse_faved": "crwdns2180:0crwdne2180:0", "lang_parse_bted": "crwdns2182:0crwdne2182:0", "lang_parse_btedsimple": "crwdns2184:0crwdne2184:0", + "lang_parse_polled": "crwdns2548:0crwdne2548:0", "lang_parse_notftime": "crwdns2186:0crwdne2186:0", "lang_parse_cwshow": "crwdns2188:0crwdne2188:0", "lang_parse_fulltext": "crwdns2190:0crwdne2190:0", @@ -148,9 +188,13 @@ var lang = { "lang_parse_clientmute": "crwdns2244:0crwdne2244:0", "lang_parse_mute": "crwdns2246:0crwdne2246:0", "lang_parse_voted": "crwdns2392:0crwdne2392:0", - "lang_parse_vote": "crwdns2394:0crwdne2394:0", + "lang_parse_vote": "crwdns2550:0crwdne2550:0", "lang_parse_unvoted": "crwdns2396:0crwdne2396:0", "lang_parse_endedvote": "crwdns2398:0crwdne2398:0", + "lang_parse_thread": "crwdns2552:0crwdne2552:0", + "lang_parse_unknown": "crwdns2578:0crwdne2578:0", + "lang_parse_nsfw": "crwdns2980:0crwdne2980:0", + "lang_parse_notffilter": "crwdns2582:0crwdne2582:0", "lang_misskeyparse_renote": "crwdns2248:0crwdne2248:0", "lang_misskeyparse_renoteqt": "crwdns2250:0crwdne2250:0", "lang_misskeyparse_reaction": "crwdns2252:0crwdne2252:0", @@ -165,7 +209,7 @@ var lang = { "lang_misskeyparse_reacted": "crwdns2372:0crwdne2372:0", "lang_setting_time": "crwdns2272:0{{set}}crwdne2272:0", "lang_setting_theme": "crwdns2274:0{{set}}crwdne2274:0", - "lang_setting_nsfw": "crwdns2276:0{{set}}crwdne2276:0", + "lang_setting_nsfw": "crwdns2982:0{{set}}crwdne2982:0", "lang_setting_cw": "crwdns2278:0{{set}}crwdne2278:0", "lang_setting_cwtext": "crwdns2280:0{{set}}crwdne2280:0", "lang_setting_cws": "crwdns2282:0{{set}}crwdne2282:0", diff --git a/app/view/make/make.js b/app/view/make/make.js index 7edc253a..1ca2ad5a 100644 --- a/app/view/make/make.js +++ b/app/view/make/make.js @@ -23,6 +23,7 @@ for (let n = 0; n < langs.length; n++) { fs.mkdirSync(targetDir); } langstr = langstr + '' + langsh[n] + '' + fs.writeFileSync("../" + lang + "/main.js", fs.readFileSync("language/" + lang + "/main.json", 'utf8').replace(/^{/, "var lang = {")) } for (let i = 0; i < samples.length; i++) { let sample = samples[i] diff --git a/app/view/make/setting.sample.html b/app/view/make/setting.sample.html index 00b70084..36d14961 100644 --- a/app/view/make/setting.sample.html +++ b/app/view/make/setting.sample.html @@ -32,7 +32,7 @@ - + From 1e4397ed7bbb347372414dfba81bacaeb0caa91c Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 5 Oct 2019 00:21:52 +0900 Subject: [PATCH 6/9] Fix: mugen streaming reconnect --- app/js/login/login.js | 2 ++ app/js/tl/notification.js | 40 ++++++++++++++++++++++++++------------- app/js/tl/tl.js | 11 ++++++----- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/app/js/login/login.js b/app/js/login/login.js index 5cccef13..dd6018f8 100644 --- a/app/js/login/login.js +++ b/app/js/login/login.js @@ -398,6 +398,8 @@ function ckdb(acct_id) { } if (json["urls"]["streaming_api"]) { localStorage.setItem("streaming_" + acct_id, json["urls"]["streaming_api"]); + }else{ + localStorage.removeItem("streaming_" + acct_id); } } }); diff --git a/app/js/tl/notification.js b/app/js/tl/notification.js index f7e3d680..c59f93c4 100644 --- a/app/js/tl/notification.js +++ b/app/js/tl/notification.js @@ -264,7 +264,21 @@ function notfWS(misskey, acct_id, tlid, domain, at) { } websocketNotf[acct_id].onerror = function (error) { console.error('WebSocket Error ' + error); - notfWS(misskey, acct_id, tlid, domain, at) + errorct++; + console.log(errorct) + if (errorct < 3) { + notfWS(misskey, acct_id, tlid, domain, at) + } + + }; + websocketNotf[acct_id].onclose = function (error) { + console.error('WebSocket Close ' + error); + errorct++; + console.log(errorct) + if (errorct < 3) { + notfWS(misskey, acct_id, tlid, domain, at) + } + }; } } @@ -361,23 +375,23 @@ function notfToggle(acct, tlid) { $("#notf-box_" + tlid).animate({ 'height': '400px' }, { - 'duration': 300, - 'complete': function () { - $("#notf-box_" + tlid).css("overflow-y", "scroll") - $("#notf-box_" + tlid).removeClass("column-hide") - } - }); + 'duration': 300, + 'complete': function () { + $("#notf-box_" + tlid).css("overflow-y", "scroll") + $("#notf-box_" + tlid).removeClass("column-hide") + } + }); } else { $("#notf-box_" + tlid).css("overflow-y", "hidden") $("#notf-box_" + tlid).animate({ 'height': '0' }, { - 'duration': 300, - 'complete': function () { - $("#notf-box_" + tlid).addClass("column-hide") - $("#notf-box_" + tlid).css("display", "none") - } - }); + 'duration': 300, + 'complete': function () { + $("#notf-box_" + tlid).addClass("column-hide") + $("#notf-box_" + tlid).css("display", "none") + } + }); } notfCanceler(acct) } diff --git a/app/js/tl/tl.js b/app/js/tl/tl.js index de4a1f43..39c4bb19 100644 --- a/app/js/tl/tl.js +++ b/app/js/tl/tl.js @@ -1,5 +1,6 @@ //TL取得 moreloading = false; +var errorct=0; function tl(type, data, acct_id, tlid, delc, voice, mode) { scrollevent(); $("#unread_" + tlid + " .material-icons").removeClass("teal-text") @@ -230,6 +231,7 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) { websocket[wsid] = new WebSocket(start); websocket[wsid].onopen = function (mess) { console.table({ "tlid": tlid, "type": "Connect Streaming API" + type, "domain": domain, "message": [mess] }) + errorct=0 $("#notice_icon_" + tlid).removeClass("red-text") } websocket[wsid].onmessage = function (mess) { @@ -317,8 +319,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) { $("#notice_icon_" + tlid).addClass("red-text") todo('WebSocket Error ' + error); } else { - var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1; - localStorage.setItem("wserror_" + tlid, errorct); + errorct++; + console.log(errorct) if (errorct < 3) { reconnector(tlid, type, acct_id, data, "error"); } @@ -331,8 +333,8 @@ function reload(type, cc, acct_id, tlid, data, mute, delc, voice, mode) { $("#notice_icon_" + tlid).addClass("red-text") todo('WebSocket Closed'); } else { - var errorct = localStorage.getItem("wserror_" + tlid) * 1 + 1; - localStorage.setItem("wserror_" + tlid, errorct); + errorct++; + console.log(errorct) if (errorct < 3) { reconnector(tlid, type, acct_id, data, "error"); } @@ -791,7 +793,6 @@ function strAlive() { var type = obj[key].type; var acct_id = obj[key].domain; var data = obj[key].data; - localStorage.removeItem("wserror_" + tlid) reconnector(key, type, acct_id, data, "error"); } }); From b4460eddf70805b85bdbe19d3d7b9c6a80e98854 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 5 Oct 2019 00:23:16 +0900 Subject: [PATCH 7/9] Update Crowdin configuration file --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 172ad285..31ca143d 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - source: /app/view/make/language/en/*.json - translation: /app/view/make/language/%language%/*.json + translation: /app/view/make/language/%language%.json From 550c84c367f7490431fae6b47ebe70d07b3269e3 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 5 Oct 2019 00:24:35 +0900 Subject: [PATCH 8/9] Update Crowdin configuration file --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 31ca143d..7210c205 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - source: /app/view/make/language/en/*.json - translation: /app/view/make/language/%language%.json + translation: /app/view/make/language/%language%/%file_name%.json From bf87c3e3f1fabe89c63c08b9985ff0b11cab6040 Mon Sep 17 00:00:00 2001 From: Cutls Date: Sat, 5 Oct 2019 01:33:47 +0900 Subject: [PATCH 9/9] Update Crowdin configuration file --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 7210c205..3fdb7b4c 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - source: /app/view/make/language/en/*.json - translation: /app/view/make/language/%language%/%file_name%.json + translation: /app/view/make/language/%locale%/%file_name%.json