Compare commits

..

12 Commits

Author SHA1 Message Date
1a485faf72 New test release v1.11.29-sc.0.test.3 2023-04-22 12:30:03 +02:00
64557e1da9 New test release v1.11.29-sc.0.test.2 2023-04-22 12:25:57 +02:00
5122f0e870 Add missing string for freeform reactions 2023-04-22 12:25:57 +02:00
0eb99a6a60 Make fixup: also check if yarn cache is broken and clean it if necessary
If `yarn cache list` fails, this can also lead to weird errors during
fixup, like
```
error /schildichat-desktop/matrix-react-sdk/node_modules/cypress: Command failed.
Exit code: 1
Command: node index.js --exec install
Arguments:
Directory: /schildichat-desktop/matrix-react-sdk/node_modules/cypress
Output:
node:internal/modules/cjs/loader:433
      throw err;
      ^

Error: Cannot find module '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals/build/src/main.js'. Please verify that the package.json has a valid "main" entry
    at tryPackage (node:internal/modules/cjs/loader:425:19)
    at Function.Module._findPath (node:internal/modules/cjs/loader:638:18)
    at Function.Module._resolveFilename (node:internal/modules/cjs/loader:1012:27)
    at Function.Module._load (node:internal/modules/cjs/loader:871:27)
    at Module.require (node:internal/modules/cjs/loader:1098:19)
    at require (node:internal/modules/cjs/helpers:108:18)
    at Object.<anonymous> (/schildichat-desktop/matrix-react-sdk/node_modules/execa/lib/error.js:2:25)
    at Module._compile (node:internal/modules/cjs/loader:1196:14)
    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1250:10)
    at Module.load (node:internal/modules/cjs/loader:1074:32) {
  code: 'MODULE_NOT_FOUND',
  path: '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals
```
2023-04-22 10:41:59 +02:00
979be00158 Add script to completely reset repos from leftovers 2023-04-22 10:41:59 +02:00
10a5112285 ruby fpm also needs its dependencies for Fedora 2023-04-21 12:47:41 +02:00
40c598e91b llvm15 seems to be necessary for Fedora 38 with rust 2023-04-21 12:37:58 +02:00
1e0e3b718c New test release v1.11.29-sc.0.test.1 2023-04-21 12:32:00 +02:00
219c0e3cf7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1 of 1 strings)

Translation: SchildiChat/schildichat-deskop/element-desktop
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/element-desktop/hu/
2023-04-20 21:06:03 +00:00
0ecdbb1bb8 Translated using Weblate (Italian)
Currently translated at 62.7% (32 of 51 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/it/
2023-04-07 11:40:28 +00:00
c5042532eb automatic_i18n_adjustment: It's still Element Call 2023-04-07 12:57:44 +02:00
b3516d1621 New test release v1.11.28-sc.0.test.1 2023-04-02 02:30:27 +02:00
11 changed files with 60 additions and 11 deletions

View File

@ -1,6 +1,6 @@
FROM fedora:latest
RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
RUN dnf install -y openssl openssl-devel rust cargo llvm15 libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
# node setup
ARG NODE_VERSION
@ -11,7 +11,7 @@ RUN bash n ${NODE_VERSION}
RUN npm install -g n
RUN npm install -g yarn
RUN npm install -g node-gyp
RUN gem install --ignore-dependencies --no-user-install --no-document fpm
RUN gem install --no-user-install --no-document fpm
COPY . /project
WORKDIR /project

View File

@ -4,6 +4,7 @@
.PHONY: container-build-debian container-build-fedora
.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
.PHONY: clean undo_setup fixup
.PHONY: fix_yarn_cache
CFGDIR ?= configs/sc
@ -182,6 +183,9 @@ bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.loc
./build-bom.sh
bom: bom.lock
fix_yarn_cache:
$(YARN) cache list || $(YARN) cache clean
clean:
$(YARN) --cwd matrix-js-sdk clean
$(YARN) --cwd matrix-react-sdk clean
@ -195,7 +199,7 @@ clean:
undo_setup:
rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
fixup: undo_setup
fixup: undo_setup fix_yarn_cache
make setup
make clean
make setup

15
hard_reset_repos.sh Executable file
View File

@ -0,0 +1,15 @@
#!/bin/bash
set -e
mydir="$(dirname "$(realpath "$0")")"
cd "$mydir"
source ./merge_helpers.sh
# Note: this doesn't delete files starting with a dot,
# and in particular not the '.git' directory, which we
# want to keep
forall_repos bash -c 'rm -rf *'
forall_repos git reset HEAD --hard

View File

@ -35,7 +35,13 @@ function writeStrings(p, strings) {
let strings = readStrings(p);
for (const key of Object.keys(strings)) {
strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat");
strings[key] = strings[key]
.replace(/Element/g, "SchildiChat")
.replace(/element\.io/g, "schildi.chat")
// It's still Element Call
.replace(/SchildiChat Call/g, "Element Call")
.replace(/SchildiChat-Call/g, "Element-Call");
}
if (overlayPath) {

View File

@ -1 +1,3 @@
{}
{
"Show": "Mutat"
}

View File

@ -49,5 +49,6 @@
"Mixed": "Mixed",
"Sound pack": "Sound pack",
"Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety",
"Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element"
"Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element",
"React with \"%(reaction)s\"": "React with \"%(reaction)s\""
}

View File

@ -9,5 +9,26 @@
"Light theme": "Tema chiaro",
"Dark theme": "Tema scuro",
"Normal priority": "Priorità normale",
"Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)"
"Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)",
"Show message bubbles on one side only": "Visualizza bolle messaggi su un lato solo",
"Show message bubbles depending on the width either on both sides or only on one side": "Visualizza bolle messaggi in base alla lunghezza di entrambi i lati o di uno solo",
"User name color mode": "Modalità colore nome utente",
"Room list style": "Stile lista stanze",
"Theme": "Tema",
"Show all rooms in Home": "Visualizza tutte le stanze nella Home",
"All rooms you're in will appear in Home.": "Tutte le stanze in cui partecipi appariranno nella Home.",
"For people": "Per le persone",
"Room list": "Lista stanze",
"Show advanced theme settings": "Visualizza impostazioni avanzate tema",
"Mark rooms as unread": "Permetti di segnare le chat come non lette",
"Message bubbles": "Bolle messaggi",
"Message layout": "Impaginazione messaggi",
"Mark as unread": "Segna come non letto",
"Uniform": "Uniforme",
"Show people in spaces": "Visualizza persone negli spazi",
"MXID": "MXID",
"In public rooms": "Nelle stanze pubbliche",
"In group chats": "Nelle chat di gruppo",
"Font size and typeface": "Dimensione e tipo carattere",
"Hide advanced theme settings": "Nascondi impostazioni avanzate tema"
}