Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.2.2-RC.22 #66

Merged
merged 2 commits into from
Nov 25, 2024
+8 −36
Merged

1.2.2-RC.22 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da7e602
react-native-skia 1.5.10
tmgrask Nov 25, 2024
c28528c
Tap to Turn On; remove unused strings
tmgrask Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ android {
applicationId 'ca.psiphon.conduit'
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 21
versionName "1.2.2-RC.21"
versionCode 22
versionName "1.2.2-RC.22"
}
signingConfigs {
config {
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/components/ConduitOrbToggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export function ConduitOrbToggle({
});
// The "Turn On" text also uses interpolation to appear to fade in by going
// from transparent to it's final color.
const orbText = t("TURN_ON_I18N.string");
const orbText = t("TAP_TO_TURN_ON_I18N.string");
const orbTextColors = [palette.transparent, palette.midGrey];
const orbTextColorIndex = useSharedValue(0);
const orbTextColor = useDerivedValue(() => {
Expand Down
32 changes: 2 additions & 30 deletions src/i18n/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,14 @@
"string": "Loading...",
"developer_comment": "Text displayed when the app is loading content."
},
"TURN_ON_I18N": {
"string": "Turn On",
"TAP_TO_TURN_ON_I18N": {
"string": "Tap to Turn On",
"developer_comment": "Text displayed on a button to turn on a feature."
},
"CONDUIT_OFF_I18N": {
"string": "Conduit is OFF",
"developer_comment": "Indicates to the user that Conduit is off. The name 'Conduit' is the app name and should not be translated."
},
"YOUR_CONDUIT_ID_I18N": {
"string": "Your Conduit ID",
"developer_comment": "Text displayed to the user to indicate their Conduit ID. The name 'Conduit' is the app name and should not be translated."
},
"ANNOUNCING_I18N": {
"string": "Announcing...",
"developer_comment": "Text displayed while the Conduit Station is announcing it's presence to the network"
},
"SERVING_N_PEERS_I18N": {
"string": "Serving {{ num }} Peers",
"developer_comment": "Indicates the number of peers currently connected to the user's Conduit Station"
},
"SHUTTING_DOWN_I18N": {
"string": "Shutting Down...",
"developer_comment": "Text displayed while the Conduit Station is shutting down"
},
"TOTAL_BYTES_TRANSFERRED_I18N": {
"string": "{{ niceBytes }} transferred"
},
Expand All @@ -36,21 +20,12 @@
"CONNECTING_PEERS_I18N": {
"string": "{{ peers }} connecting"
},
"DONE_I18N": {
"string": "Done"
},
"CANCEL_I18N": {
"string": "Cancel"
},
"CONFIRM_I18N": {
"string": "Confirm"
},
"SAVE_I18N": {
"string": "Save"
},
"EDIT_SETTINGS_I18N": {
"string": "Edit Settings"
},
"MAX_PEERS_I18N": {
"string": "Max Peers"
},
Expand Down Expand Up @@ -78,9 +53,6 @@
"ENABLED_I18N": {
"string": "Enabled"
},
"PROXY_STATUS_I18N": {
"string": "Conduit Station is {{ status }}"
},
"CONDUIT_STATION_I18N": {
"string": "Conduit Station"
},
Expand Down