forked from github/schildichat-desktop
Compare commits
No commits in common. "v1.9.0-sc.1" and "v1.8.5-sc1" have entirely different histories.
v1.9.0-sc.
...
v1.8.5-sc1
17 changed files with 26 additions and 277 deletions
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
|
||||
pushd "$mydir" > /dev/null
|
||||
|
||||
source ./merge_helpers.sh
|
||||
|
||||
# Check branch
|
||||
check_branch $branch
|
||||
forall_repos check_branch $branch
|
||||
|
||||
# Ensure clean git state
|
||||
forall_repos check_clean_git
|
||||
|
||||
bump_release_version
|
||||
|
||||
popd > /dev/null
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
|
||||
pushd "$mydir" > /dev/null
|
||||
|
||||
source ./merge_helpers.sh
|
||||
|
||||
# Check branch
|
||||
check_branch $branch
|
||||
forall_repos check_branch $branch
|
||||
|
||||
# Ensure clean git state
|
||||
forall_repos check_clean_git
|
||||
|
||||
bump_test_version
|
||||
|
||||
popd > /dev/null
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 5db2e4416cd94840bd795464f647172ccbfe01d2
|
||||
Subproject commit 04d86eb9fc3805ed8925c6e5ccdb53d3c54c9931
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 8bbf862d874f2e33cd3477dd8bc0ed89164f7a0c
|
||||
Subproject commit 18331cb1bc4b3783da239dd311911a039d5e0430
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -14,23 +14,5 @@
|
|||
"Light theme": "Světlý motiv",
|
||||
"Dark theme": "Tmavý motiv",
|
||||
"Add custom theme": "Přidat vlastní motiv",
|
||||
"Theme in use": "Používaný motiv",
|
||||
"User name color mode": "Barevný režim uživatelského jména",
|
||||
"Uniform": "Jednotný",
|
||||
"PowerLevel": "Úroveň oprávnění",
|
||||
"MXID": "MXID",
|
||||
"In group chats": "Ve skupinových chatech",
|
||||
"In public rooms": "Ve veřejných místnostech",
|
||||
"All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v domovském zobrazení.",
|
||||
"Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení",
|
||||
"Show people in spaces": "Ukázat lidi v prostorech",
|
||||
"Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé v prostorech",
|
||||
"Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru",
|
||||
"If disabled, the space overview will be shown when switching to another space.": "Pokud je vypnuto, zobrazí se při přepnutí do jiného prostoru přehled prostorů.",
|
||||
"For people": "Pro osoby",
|
||||
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Pokud je zakázáno, můžete stále přidávat přímé zprávy do osobních prostorů. Pokud je povoleno, automaticky se zobrazí všichni, kteří jsou členy daného prostoru.",
|
||||
"Intermediate: medium sized avatar with single-line preview": "Střední: středně velký avatar s jednořádkovým náhledem",
|
||||
"Roomy: big avatar with two-line preview": "Prostorný: velký avatar s dvouřádkovým náhledem",
|
||||
"Room list style": "Styl seznamu místností",
|
||||
"Compact: tiny avatar together with name and preview in one line": "Kompaktní: malý avatar spolu se jménem a náhledem v jednom řádku"
|
||||
"Theme in use": "Používaný motiv"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@
|
|||
"Enable experimental, compact IRC style layout": "Kompaktes, experimentelles Layout im IRC-Stil aktivieren",
|
||||
"Enable layout with message bubbles": "Layout mit Sprechblasen aktivieren",
|
||||
"Show message bubbles on one side only": "Sprechblasen nur auf einer Seite anzeigen",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Sprechblasen abhängig von der Breite auf beiden Seiten oder nur einer Seite anzeigen",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Sprechblasen abhänging von der Breite auf beiden Seiten oder nur einer Seite anzeigen",
|
||||
"%(brand)s can't securely cache encrypted messages locally while running in a web browser. Use <desktopLink>%(brand)s Desktop</desktopLink> for encrypted messages to appear in search results.": "%(brand)s kann verschlüsselte Nachrichten nicht sicher während der Ausführung im Browser durchsuchen. Benutze <desktopLink>%(brand)s Desktop</desktopLink>, um verschlüsselte Nachrichten in den Suchergebnissen angezeigt zu bekommen.",
|
||||
"Use default": "Standardeinstellungen benutzen",
|
||||
"Your firewall or anti-virus is blocking the request.": "Deine Firewall oder dein Antivirenprogramm blockiert die Anfrage.",
|
||||
|
|
@ -129,14 +129,5 @@
|
|||
"All rooms you're in will appear in Home.": "Alle Räume, in denen du dich befindest, werden auf der Startseite angezeigt.",
|
||||
"Show people in spaces": "Personen in Spaces anzeigen",
|
||||
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Falls deaktiviert, kannst du trotzdem Direktnachrichten in privaten Spaces hinzufügen. Falls aktiviert, wirst du alle Mitglieder des Spaces sehen.",
|
||||
"For people": "Für Personen",
|
||||
"Intermediate: medium sized avatar with single-line preview": "Zwischending: mittelgroßer Avatar mit einer einzeiligen Vorschau",
|
||||
"Roomy: big avatar with two-line preview": "Geräumig: großer Avatar mit einer zweizeiligen Vorschau",
|
||||
"Room list style": "Stil der Raumliste",
|
||||
"Compact: tiny avatar together with name and preview in one line": "Kompakt: winziger Avatar zusammen mit dem Namen und der Vorschau in einer Zeile",
|
||||
"Hide advanced theme settings": "Erweiterte Designeinstellungen ausblenden",
|
||||
"Theme": "Design",
|
||||
"Room list": "Raumliste",
|
||||
"Font size and typeface": "Schriftgröße und Schriftart",
|
||||
"Show advanced theme settings": "Erweiterte Designeinstellungen anzeigen"
|
||||
"For people": "Für Personen"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,14 +27,5 @@
|
|||
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.",
|
||||
"Show notification badges for People in Spaces": "Show notification badges for People in Spaces",
|
||||
"Return to the room previously opened in a space": "Return to the room previously opened in a space",
|
||||
"If disabled, the space overview will be shown when switching to another space.": "If disabled, the space overview will be shown when switching to another space.",
|
||||
"Compact: tiny avatar together with name and preview in one line": "Compact: tiny avatar together with name and preview in one line",
|
||||
"Intermediate: medium sized avatar with single-line preview": "Intermediate: medium sized avatar with single-line preview",
|
||||
"Roomy: big avatar with two-line preview": "Roomy: big avatar with two-line preview",
|
||||
"Room list style": "Room list style",
|
||||
"Hide advanced theme settings": "Hide advanced theme settings",
|
||||
"Show advanced theme settings": "Show advanced theme settings",
|
||||
"Theme": "Theme",
|
||||
"Room list": "Room list",
|
||||
"Font size and typeface": "Font size and typeface"
|
||||
"If disabled, the space overview will be shown when switching to another space.": "If disabled, the space overview will be shown when switching to another space."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,23 +6,5 @@
|
|||
"Message layout": "Așezarea mesajului",
|
||||
"Modern": "Modern",
|
||||
"Show people and rooms in a combined list": "Arată persoanele și camerele într-o listă combinată",
|
||||
"Update notifications": "Actualizează notificările",
|
||||
"Don't ask again": "Nu întreba din nou",
|
||||
"System": "Sistem",
|
||||
"Add custom theme": "Adaugă o temă proprie",
|
||||
"Theme in use": "Temă în folosință",
|
||||
"Light theme": "Temă luminoasă",
|
||||
"Dark theme": "Temă întunecată",
|
||||
"Uniform": "Uniform",
|
||||
"In group chats": "În chaturile de grup",
|
||||
"In public rooms": "În camerele publice",
|
||||
"All rooms you're in will appear in Home.": "Toate camerele în care te afli vor apărea în Pagina principala",
|
||||
"Show people in spaces": "Arată persoanele în spații",
|
||||
"Show notification badges for People in Spaces": "Arată simboluri de notificare pentru Persoanele din Spații",
|
||||
"Return to the room previously opened in a space": "Întoarce-te spre camera deschisă ultima oară într-un spațiu",
|
||||
"If disabled, the space overview will be shown when switching to another space.": "Dacă e dezactivat, se va arăta vederea de ansamblu a spațiului când schimbi pe alt spațiu.",
|
||||
"For people": "Pentru persoane",
|
||||
"User name color mode": "Modul culorilor utilizatorilor",
|
||||
"Show all rooms in Home": "Arată toate camerele în Pagina principală",
|
||||
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Dacă e dezactivat, încă poți adăuga Mesaje Directe în Spații Personale. Dacă e activat, vei vedea toți membrii Spațiului automat."
|
||||
"Update notifications": "Actualizează notificările"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,19 +13,5 @@
|
|||
"Dark theme": "Mörkt tema",
|
||||
"Show message bubbles on one side only": "Visa meddelandebubblor bara på ena sidan",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "Visa meddelandebubblor beroende på bredden antingen på båda sidor eller bara på ena sidan",
|
||||
"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).": "Vill du gå med i ett rum som informerar dig om nya utgåvor? Detta är särskilt användbart om din plattform inte stöder automatiska uppdateringar för SchildiChat (t.ex.Windows och macOS).",
|
||||
"Uniform": "Enhetlig",
|
||||
"PowerLevel": "PowerLevel",
|
||||
"MXID": "MXID",
|
||||
"In group chats": "I gruppchattar",
|
||||
"In public rooms": "I offentliga rum",
|
||||
"Show all rooms in Home": "Visa alla rum i Home",
|
||||
"Show people in spaces": "Visa människor i Spaces",
|
||||
"If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Om den är inaktiverad kan du fortfarande lägga till direktmeddelanden till personliga utrymmen. Om den är aktiverad ser du automatiskt alla som är medlem i Space.",
|
||||
"Show notification badges for People in Spaces": "Visa meddelandemärken för personer in Spaces",
|
||||
"Return to the room previously opened in a space": "Återgå till rummet som tidigare öppnats i ett Space",
|
||||
"If disabled, the space overview will be shown when switching to another space.": "Om den är inaktiverad visas utrymmeöversikten när du byter till ett annat utrymme.",
|
||||
"For people": "För folk",
|
||||
"User name color mode": "Användarnamns färgläge",
|
||||
"All rooms you're in will appear in Home.": "Alla rum du befinner dig i visas i Home."
|
||||
"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).": "Vill du gå med i ett rum som informerar dig om nya utgåvor? Detta är särskilt användbart om din plattform inte stöder automatiska uppdateringar för SchildiChat (t.ex.Windows och macOS)."
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
{}
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit f89d87f42fd8b416f6eb15c3c4eedadbbb647b2e
|
||||
Subproject commit cf15dbc8f2023af4a7eb08bc8af553453db11ef0
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit c46aa0b23345083c59a19e742bf152b5a470641c
|
||||
Subproject commit 8a14b9e2872acc80faedf5ed3bd25705f114947a
|
||||
128
merge_helpers.sh
128
merge_helpers.sh
|
|
@ -2,8 +2,6 @@
|
|||
|
||||
SCHILDI_ROOT="$(dirname "$(realpath "$0")")"
|
||||
|
||||
branch=${BRANCH:-"sc"}
|
||||
|
||||
i18n_helper_path="$SCHILDI_ROOT/i18n-helper/index.js"
|
||||
i18n_path="src/i18n/strings"
|
||||
i18n_overlay_path="$SCHILDI_ROOT/i18n-overlays"
|
||||
|
|
@ -32,31 +30,18 @@ add_upstream() {
|
|||
}
|
||||
|
||||
forall_repos() {
|
||||
pushd "$SCHILDI_ROOT/matrix-js-sdk" > /dev/null
|
||||
pushd "$SCHILDI_ROOT/matrix-js-sdk"
|
||||
"$@"
|
||||
popd > /dev/null
|
||||
|
||||
pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
|
||||
popd
|
||||
pushd "$SCHILDI_ROOT/matrix-react-sdk"
|
||||
"$@"
|
||||
popd > /dev/null
|
||||
|
||||
pushd "$SCHILDI_ROOT/element-web" > /dev/null
|
||||
popd
|
||||
pushd "$SCHILDI_ROOT/element-web"
|
||||
"$@"
|
||||
popd > /dev/null
|
||||
|
||||
pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
|
||||
popd
|
||||
pushd "$SCHILDI_ROOT/element-desktop"
|
||||
"$@"
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
forelement_repos() {
|
||||
pushd "$SCHILDI_ROOT/element-web" > /dev/null
|
||||
"$@"
|
||||
popd > /dev/null
|
||||
|
||||
pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
|
||||
"$@"
|
||||
popd > /dev/null
|
||||
popd
|
||||
}
|
||||
|
||||
ensure_yes() {
|
||||
|
|
@ -105,15 +90,15 @@ automatic_i18n_reversion() {
|
|||
local skip_commit="$1"
|
||||
|
||||
pushd "$SCHILDI_ROOT/matrix-react-sdk" > /dev/null
|
||||
revert_i18n_changes "$i18n_path" "$skip_commit"
|
||||
revert_i18n_changes "$i18n_path" $skip_commit
|
||||
popd > /dev/null
|
||||
|
||||
pushd "$SCHILDI_ROOT/element-web" > /dev/null
|
||||
revert_i18n_changes "$i18n_path" "$skip_commit"
|
||||
revert_i18n_changes "$i18n_path" $skip_commit
|
||||
popd > /dev/null
|
||||
|
||||
pushd "$SCHILDI_ROOT/element-desktop" > /dev/null
|
||||
revert_i18n_changes "$i18n_path" "$skip_commit"
|
||||
revert_i18n_changes "$i18n_path" $skip_commit
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
|
|
@ -139,94 +124,3 @@ automatic_i18n_adjustment() {
|
|||
apply_i18n_changes "$i18n_path"
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
get_current_versions() {
|
||||
local version=`cat "$SCHILDI_ROOT/element-web/package.json" | jq .version -r`
|
||||
if [[ "$version" =~ ([0-9\.]*)(-sc\.([0-9]+)(\.test.([0-9]+))?)? ]]; then
|
||||
upstream="${BASH_REMATCH[1]}"
|
||||
release="${BASH_REMATCH[3]}"
|
||||
test="${BASH_REMATCH[5]}"
|
||||
fi
|
||||
|
||||
versions=("${upstream:-"0.0.1"}" "${release:-"0"}" "${test:-"0"}")
|
||||
}
|
||||
|
||||
get_versions_string() {
|
||||
versions_string="${versions[0]}-sc.${versions[1]}"
|
||||
|
||||
if [[ ${versions[2]} -gt 0 ]]; then
|
||||
versions_string+=".test.${versions[2]}"
|
||||
fi
|
||||
}
|
||||
|
||||
write_version() {
|
||||
local file="$1"
|
||||
local versions_string
|
||||
get_versions_string
|
||||
|
||||
new_content=`jq --arg version "$versions_string" '.version = $version' "$file"`
|
||||
echo "$new_content" > "$file"
|
||||
|
||||
git add "$file"
|
||||
git commit -m "Update version to $versions_string" || true
|
||||
}
|
||||
|
||||
bump_test_version() {
|
||||
local versions
|
||||
get_current_versions
|
||||
|
||||
# increment test version
|
||||
(( versions[2]++ ))
|
||||
|
||||
forelement_repos write_version "package.json"
|
||||
}
|
||||
|
||||
bump_release_version() {
|
||||
local versions
|
||||
get_current_versions
|
||||
|
||||
# increment release version
|
||||
(( versions[1]++ ))
|
||||
|
||||
# set test version to 0
|
||||
versions[2]=0
|
||||
|
||||
forelement_repos write_version "package.json"
|
||||
}
|
||||
|
||||
revert_packagejson_changes() {
|
||||
local path="$1"
|
||||
local skip_commit="$2"
|
||||
|
||||
git checkout upstream/master -- "$path"
|
||||
|
||||
if [[ "$skip_commit" != [Yy]* ]]; then
|
||||
git commit -m "Automatic package.json reversion" || true
|
||||
fi
|
||||
}
|
||||
|
||||
apply_packagejson_overlay() {
|
||||
local orig_path="$1"
|
||||
local overlay_path="$2"
|
||||
|
||||
# see: https://stackoverflow.com/a/24904276
|
||||
new_content=`jq -s '.[0] * .[1]' "$orig_path" "$overlay_path"`
|
||||
|
||||
echo "$new_content" > "$orig_path"
|
||||
git add "$orig_path"
|
||||
git commit -m "Automatic package.json adjustment" || true
|
||||
}
|
||||
|
||||
automatic_packagejson_reversion() {
|
||||
local skip_commit="$1"
|
||||
|
||||
forelement_repos revert_packagejson_changes "package.json" "$skip_commit"
|
||||
}
|
||||
|
||||
automatic_packagejson_adjustment() {
|
||||
local versions
|
||||
get_current_versions
|
||||
|
||||
forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json"
|
||||
forelement_repos write_version "package.json"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
branch=${BRANCH:-"sc"}
|
||||
|
||||
pushd "$mydir" > /dev/null
|
||||
|
||||
|
|
@ -15,23 +16,19 @@ forall_repos check_branch $branch
|
|||
# Ensure clean git state
|
||||
forall_repos check_clean_git
|
||||
|
||||
# Fetch upstream
|
||||
forall_repos git fetch upstream
|
||||
|
||||
# Automatic reversions
|
||||
# Automatic i18n reversion
|
||||
automatic_i18n_reversion
|
||||
automatic_packagejson_reversion
|
||||
|
||||
# Merge upstream
|
||||
# Merge
|
||||
forall_repos git fetch upstream
|
||||
forall_repos git merge upstream/master
|
||||
|
||||
# Refresh environment
|
||||
make clean
|
||||
make setup
|
||||
|
||||
# Automatic adjustments
|
||||
# Automatic i18n adjustment
|
||||
automatic_i18n_adjustment
|
||||
automatic_packagejson_adjustment
|
||||
|
||||
# Automatic theme update
|
||||
pushd "matrix-react-sdk" > /dev/null
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
mydir="$(dirname "$(realpath "$0")")"
|
||||
|
||||
pushd "$mydir" > /dev/null
|
||||
|
||||
source ./merge_helpers.sh
|
||||
|
||||
# Check branch
|
||||
check_branch $branch
|
||||
forall_repos check_branch $branch
|
||||
|
||||
# Ensure clean git state
|
||||
forall_repos check_clean_git
|
||||
|
||||
git fetch origin
|
||||
git branch -D master || true
|
||||
git checkout -b master --track origin/master
|
||||
git merge --ff-only sc
|
||||
git push
|
||||
git checkout sc
|
||||
forall_repos git fetch origin
|
||||
forall_repos git branch -D master || true
|
||||
forall_repos git checkout -b master --track origin/master
|
||||
forall_repos git merge --ff-only sc
|
||||
forall_repos git push
|
||||
forall_repos git checkout sc
|
||||
|
||||
popd > /dev/null
|
||||
Loading…
Add table
Add a link
Reference in a new issue