Skip to content

Commit b1e253d

Browse files
authored
Merge branch 'master' into fix/price-widget-layout
2 parents 9bbf1ad + d89adcf commit b1e253d

File tree

19 files changed

+7203
-5394
lines changed

19 files changed

+7203
-5394
lines changed

README.md

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,20 +90,34 @@ To pull the latest translations from Transifex:
9090
- Follow the installation instructions: [Transifex CLI Installation](https://developers.transifex.com/docs/cli)
9191

9292
2. **Authenticate with Transifex** (if not already configured):
93-
- Create a `.transifexrc` file in your home directory (`~/.transifexrc`) with your API token:
94-
```ini
95-
[https://www.transifex.com]
96-
rest_hostname = https://rest.api.transifex.com
97-
token = YOUR_API_TOKEN_HERE
93+
- Set the `TX_TOKEN` environment variable with your API token:
94+
```sh
95+
export TX_TOKEN="YOUR_API_TOKEN_HERE"
9896
```
99-
- You can get your API token from your [Transifex account settings](https://www.transifex.com/user/settings/api/)
100-
- The CLI will prompt you for an API token if one is not configured
97+
- You can get your API token from [Transifex account settings](https://www.transifex.com/user/settings/api/)
98+
- Add it to `~/.zshrc` or other shell rc file to persist across sessions
10199

102100
3. **Pull translations**:
103101
```sh
104102
./scripts/pull-translations.sh
105103
```
106104

105+
### Pushing Source Strings
106+
107+
When you add or modify translation keys in the EN source file, push them to Transifex:
108+
109+
```sh
110+
tx push --source
111+
```
112+
113+
### Translation Workflow
114+
115+
1. **Add/modify strings** in `app/src/main/res/values/strings.xml`
116+
2. **Push to Transifex:** `tx push --source`
117+
3. **Translators** work on translations in Transifex
118+
4. **Pull translations:** `./scripts/pull-translations.sh`
119+
5. **Commit** the updated translation files
120+
107121
## Build
108122

109123
### Bitcoin Networks

app/src/main/java/to/bitkit/ext/FileSystem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import to.bitkit.utils.AppError
44
import java.io.File
55
import kotlin.io.path.exists
66

7-
fun File.ensureDir() = this.also {
7+
fun File.ensureDir(): File = this.also {
88
if (toPath().exists()) return this
99

1010
val path = if (extension.isEmpty()) this else parentFile

app/src/main/java/to/bitkit/ui/components/DrawerMenu.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import androidx.compose.ui.res.painterResource
3434
import androidx.compose.ui.res.stringResource
3535
import androidx.compose.ui.text.TextStyle
3636
import androidx.compose.ui.text.font.FontWeight
37+
import androidx.compose.ui.text.style.TextOverflow
3738
import androidx.compose.ui.tooling.preview.Preview
3839
import androidx.compose.ui.unit.dp
3940
import androidx.compose.ui.unit.sp
@@ -291,6 +292,8 @@ private fun DrawerItem(
291292
fontFamily = InterFontFamily,
292293
color = Colors.White,
293294
),
295+
maxLines = 1,
296+
overflow = TextOverflow.Ellipsis,
294297
modifier = Modifier.weight(1f)
295298
)
296299
}

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,8 @@ private fun CopyAddressCard(
627627
tint = if (type == CopyAddressType.ONCHAIN) Colors.Brand else Colors.Purple,
628628
modifier = Modifier.size(18.dp)
629629
)
630-
}
630+
},
631+
modifier = Modifier.weight(1f)
631632
)
632633
}
633634
}

app/src/main/res/values-ar/strings.xml

Lines changed: 990 additions & 25 deletions
Large diffs are not rendered by default.

app/src/main/res/values-b+es+419/strings.xml

Lines changed: 187 additions & 312 deletions
Large diffs are not rendered by default.

app/src/main/res/values-ca/strings.xml

Lines changed: 885 additions & 505 deletions
Large diffs are not rendered by default.

app/src/main/res/values-cs/strings.xml

Lines changed: 823 additions & 948 deletions
Large diffs are not rendered by default.

app/src/main/res/values-de/strings.xml

Lines changed: 231 additions & 334 deletions
Large diffs are not rendered by default.

app/src/main/res/values-el/strings.xml

Lines changed: 969 additions & 45 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)