Page MenuHomePhorge
Files F28807

D146.1726798133.diff
No OneTemporary
Actions

D146.1726798133.diff
View Options

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,11 +32,13 @@
script:
- 'echo "{\"receiver\": \"$TARGET_PHID\", \"type\": \"work\", \"unit\": [{\"name\": \"GitLab CI (information only)\", \"result\": \"skip\", \"details\": \"$pipelineUrl\", \"format\": \"remarkup\"}]}" | /tools/arcanist/bin/arc call-conduit --conduit-uri https://iron.lily-is.land/ --conduit-token "$CONDUIT_TOKEN" -- harbormaster.sendmessage'
-'lint:no-tabs':
+'lint':
stage: lint
- script: |
- echo 'Verify that no source file contains tabs'
- ! egrep -R --exclude-dir=transformed-libs --exclude-dir=Intl.js --exclude-dir=node_modules $'\t' src
+ script:
+ - "echo 'Verify that no source file contains tabs'"
+ - "! egrep -R --exclude-dir=transformed-libs --exclude-dir=Intl.js --exclude-dir=node_modules $'\t' src"
+ - "echo 'Verify that no source file contains trailing spaces'"
+ - "! egrep -R --exclude-dir=transformed-libs --exclude-dir=Intl.js --exclude-dir=node_modules '\\s$' src"
rules: &build-rules
- changes: &src-chg
- Dockerfile.deps
diff --git a/src/contents/ui/SendMessageBox.qml b/src/contents/ui/SendMessageBox.qml
--- a/src/contents/ui/SendMessageBox.qml
+++ b/src/contents/ui/SendMessageBox.qml
@@ -66,17 +66,17 @@
Control {
visible: !!sendMessageBox.draftRelatedTo
Layout.fillWidth: true
-
+
background: Rectangle {
color: Kirigami.Theme.alternateBackgroundColor
}
-
+
contentItem: RowLayout {
spacing: 0
-
+
ColumnLayout {
Layout.fillWidth: true
-
+
Label {
id: replyLabel
Layout.leftMargin: Kirigami.Units.largeSpacing
@@ -84,7 +84,7 @@
Layout.fillWidth: true
text: getRelationPrompt(sendMessageBox.draftRelType)
}
-
+
Item {
id: replyItem
Layout.minimumHeight: Math.min(replyToEventView.implicitHeight, Kirigami.Units.gridUnit * 5)
@@ -209,7 +209,7 @@
if (mouse.button === Qt.RightButton)
textAreaMenu.popup();
}
-
+
Menu {
id: textAreaMenu
MenuItem {
diff --git a/src/l10n/hi/100-ui.ftl b/src/l10n/hi/100-ui.ftl
--- a/src/l10n/hi/100-ui.ftl
+++ b/src/l10n/hi/100-ui.ftl
@@ -7,7 +7,7 @@
global-drawer-title = { -kt-app-name }
global-drawer-action-switch-account = खाता बदले
global-drawer-action-hard-logout = लॉग आउट
-global-drawer-action-save-session = इस सेशन को सेव करें
+global-drawer-action-save-session = इस सेशन को सेव करें
empty-room-page-title = कोई कमरे नहीं चुने गए है
empty-room-page-description = अभी कोई कमरा नहीं चुना गया है।
@@ -25,7 +25,7 @@
login-page-discover-failed-prompt = यह यूज़र जिस सर्वर पर है उसका पता लगाने में असमर्थ, या सर्वर अनुपलब्ध है। एरर कोड: { $errorCode }। एरर संदेश: { $errorMsg }।
## main-page-title = { -kt-app-name } - { $userId }
-main-page-recent-tab-title = रीसेंट
+main-page-recent-tab-title = रीसेंट
main-page-people-tab-title = लोग
main-page-rooms-tab-title = कमरे

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 19, 7:08 PM (4 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15982
Default Alt Text
D146.1726798133.diff (3 KB)

Event Timeline