Skip to content

Commit 787fea6

Browse files
enpipienpipi
authored
Merge branch 'main' into optimization-japanase-text
2 parents 970bef7 + 24a49f9 commit 787fea6

File tree

6 files changed

+245
-7
lines changed

6 files changed

+245
-7
lines changed

‎CHANGELOG.md

+14
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,20 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [2.0.8] - 2024-08-16
8+
Requires macOS 12.0 and higher.
9+
10+
### Changed
11+
- Japenese Localization
12+
- Thanks to [enpipi](https://github.com/enpipi) for the changes!
13+
- [637](https://github.com/macadmins/nudge/issues/637)
14+
- The `Debug` schema no longer honors `randomDelay`
15+
16+
### Fixed
17+
- The left side of Nudge is no longer cut off when using more "verbose" languages
18+
- [640](https://github.com/macadmins/nudge/issues/640)
19+
- The left side of Nudge now has proper localization for the values `True` and `False`
20+
721
## [2.0.7] - 2024-08-08
822
Requires macOS 12.0 and higher.
923

‎Localizable.xcstrings

+216
Original file line numberDiff line numberDiff line change
@@ -2045,6 +2045,114 @@
20452045
}
20462046
}
20472047
},
2048+
"False" : {
2049+
"comment" : "Actively Exploited CVEs",
2050+
"extractionState" : "manual",
2051+
"localizations" : {
2052+
"da" : {
2053+
"stringUnit" : {
2054+
"state" : "translated",
2055+
"value" : "Falsk"
2056+
}
2057+
},
2058+
"de" : {
2059+
"stringUnit" : {
2060+
"state" : "translated",
2061+
"value" : "Falsch"
2062+
}
2063+
},
2064+
"en" : {
2065+
"stringUnit" : {
2066+
"state" : "translated",
2067+
"value" : "False"
2068+
}
2069+
},
2070+
"es" : {
2071+
"stringUnit" : {
2072+
"state" : "translated",
2073+
"value" : "Falso"
2074+
}
2075+
},
2076+
"fr" : {
2077+
"stringUnit" : {
2078+
"state" : "translated",
2079+
"value" : "Faux"
2080+
}
2081+
},
2082+
"hi" : {
2083+
"stringUnit" : {
2084+
"state" : "translated",
2085+
"value" : "असत्य"
2086+
}
2087+
},
2088+
"it" : {
2089+
"stringUnit" : {
2090+
"state" : "translated",
2091+
"value" : "Falso"
2092+
}
2093+
},
2094+
"ja" : {
2095+
"stringUnit" : {
2096+
"state" : "translated",
2097+
"value" : "偽"
2098+
}
2099+
},
2100+
"ko" : {
2101+
"stringUnit" : {
2102+
"state" : "translated",
2103+
"value" : "거짓"
2104+
}
2105+
},
2106+
"nb" : {
2107+
"stringUnit" : {
2108+
"state" : "translated",
2109+
"value" : "Usann"
2110+
}
2111+
},
2112+
"nl" : {
2113+
"stringUnit" : {
2114+
"state" : "translated",
2115+
"value" : "Onwaar"
2116+
}
2117+
},
2118+
"pl" : {
2119+
"stringUnit" : {
2120+
"state" : "translated",
2121+
"value" : "Fałsz"
2122+
}
2123+
},
2124+
"pt" : {
2125+
"stringUnit" : {
2126+
"state" : "translated",
2127+
"value" : "Falso"
2128+
}
2129+
},
2130+
"ru" : {
2131+
"stringUnit" : {
2132+
"state" : "translated",
2133+
"value" : "Ложь"
2134+
}
2135+
},
2136+
"sv" : {
2137+
"stringUnit" : {
2138+
"state" : "translated",
2139+
"value" : "Falskt"
2140+
}
2141+
},
2142+
"uk" : {
2143+
"stringUnit" : {
2144+
"state" : "translated",
2145+
"value" : "Брехня"
2146+
}
2147+
},
2148+
"zh" : {
2149+
"stringUnit" : {
2150+
"state" : "translated",
2151+
"value" : "假"
2152+
}
2153+
}
2154+
}
2155+
},
20482156
"Hours Remaining To Update:" : {
20492157
"comment" : "Hours Remaining To Update:",
20502158
"extractionState" : "manual",
@@ -3449,6 +3557,114 @@
34493557
}
34503558
}
34513559
},
3560+
"True" : {
3561+
"comment" : "Actively Exploited CVEs",
3562+
"extractionState" : "manual",
3563+
"localizations" : {
3564+
"da" : {
3565+
"stringUnit" : {
3566+
"state" : "translated",
3567+
"value" : "Sand"
3568+
}
3569+
},
3570+
"de" : {
3571+
"stringUnit" : {
3572+
"state" : "translated",
3573+
"value" : "Wahr"
3574+
}
3575+
},
3576+
"en" : {
3577+
"stringUnit" : {
3578+
"state" : "translated",
3579+
"value" : "True"
3580+
}
3581+
},
3582+
"es" : {
3583+
"stringUnit" : {
3584+
"state" : "translated",
3585+
"value" : "Verdadero"
3586+
}
3587+
},
3588+
"fr" : {
3589+
"stringUnit" : {
3590+
"state" : "translated",
3591+
"value" : "Vrai"
3592+
}
3593+
},
3594+
"hi" : {
3595+
"stringUnit" : {
3596+
"state" : "translated",
3597+
"value" : "सत्य"
3598+
}
3599+
},
3600+
"it" : {
3601+
"stringUnit" : {
3602+
"state" : "translated",
3603+
"value" : "Vero"
3604+
}
3605+
},
3606+
"ja" : {
3607+
"stringUnit" : {
3608+
"state" : "translated",
3609+
"value" : "真実"
3610+
}
3611+
},
3612+
"ko" : {
3613+
"stringUnit" : {
3614+
"state" : "translated",
3615+
"value" : "참"
3616+
}
3617+
},
3618+
"nb" : {
3619+
"stringUnit" : {
3620+
"state" : "translated",
3621+
"value" : "Sann"
3622+
}
3623+
},
3624+
"nl" : {
3625+
"stringUnit" : {
3626+
"state" : "translated",
3627+
"value" : "Waar"
3628+
}
3629+
},
3630+
"pl" : {
3631+
"stringUnit" : {
3632+
"state" : "translated",
3633+
"value" : "Prawda"
3634+
}
3635+
},
3636+
"pt" : {
3637+
"stringUnit" : {
3638+
"state" : "translated",
3639+
"value" : "Verdade"
3640+
}
3641+
},
3642+
"ru" : {
3643+
"stringUnit" : {
3644+
"state" : "translated",
3645+
"value" : "Правда"
3646+
}
3647+
},
3648+
"sv" : {
3649+
"stringUnit" : {
3650+
"state" : "translated",
3651+
"value" : "Sant"
3652+
}
3653+
},
3654+
"uk" : {
3655+
"stringUnit" : {
3656+
"state" : "translated",
3657+
"value" : "Правда"
3658+
}
3659+
},
3660+
"zh" : {
3661+
"stringUnit" : {
3662+
"state" : "translated",
3663+
"value" : "真"
3664+
}
3665+
}
3666+
}
3667+
},
34523668
"Update Device" : {
34533669
"comment" : "actionButtonText",
34543670
"extractionState" : "manual",

‎Nudge.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@
698698
"@executable_path/../Frameworks",
699699
);
700700
MACOSX_DEPLOYMENT_TARGET = 12.0;
701-
MARKETING_VERSION = 2.0.7;
701+
MARKETING_VERSION = 2.0.8;
702702
PRODUCT_BUNDLE_IDENTIFIER = com.github.macadmins.Nudge;
703703
PRODUCT_NAME = "$(TARGET_NAME)";
704704
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -729,7 +729,7 @@
729729
"@executable_path/../Frameworks",
730730
);
731731
MACOSX_DEPLOYMENT_TARGET = 12.0;
732-
MARKETING_VERSION = 2.0.7;
732+
MARKETING_VERSION = 2.0.8;
733733
PRODUCT_BUNDLE_IDENTIFIER = com.github.macadmins.Nudge;
734734
PRODUCT_NAME = "$(TARGET_NAME)";
735735
PROVISIONING_PROFILE_SPECIFIER = "";

‎Nudge.xcodeproj/xcshareddata/xcschemes/Nudge - Debug.xcscheme

+6
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@
7676
ReferencedContainer = "container:Nudge.xcodeproj">
7777
</BuildableReference>
7878
</BuildableProductRunnable>
79+
<CommandLineArguments>
80+
<CommandLineArgument
81+
argument = "-disable-random-delay"
82+
isEnabled = "YES">
83+
</CommandLineArgument>
84+
</CommandLineArguments>
7985
</LaunchAction>
8086
<ProfileAction
8187
buildConfiguration = "Release"

‎Nudge/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<key>CFBundlePackageType</key>
1616
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>2.0.7</string>
18+
<string>2.0.8</string>
1919
<key>CFBundleVersion</key>
20-
<string>2.0.7</string>
20+
<string>2.0.8</string>
2121
<key>LSApplicationCategoryType</key>
2222
<string>public.app-category.utilities</string>
2323
<key>LSMinimumSystemVersion</key>

‎Nudge/UI/StandardMode/LeftSide.swift

+5-3
Original file line numberDiff line numberDiff line change
@@ -82,20 +82,22 @@ struct InfoRow: View {
8282
HStack {
8383
Text(label.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale)))
8484
.fontWeight(boldText ? .bold : .regular)
85+
.lineLimit(2)
8586
Spacer()
8687
if isHighlighted {
87-
Text(value)
88+
Text(value.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale)))
8889
.foregroundColor(appState.differentiateWithoutColor ? .accessibleRed : .red)
8990
.fontWeight(.bold)
9091
.minimumScaleFactor(0.01)
92+
.lineLimit(1)
9193
} else {
92-
Text(value)
94+
Text(value.localized(desiredLanguage: getDesiredLanguage(locale: appState.locale)))
9395
.foregroundColor(colorScheme == .light ? .accessibleSecondaryLight : .accessibleSecondaryDark)
9496
.fontWeight(boldText ? .bold : .regular)
9597
.minimumScaleFactor(0.01)
98+
.lineLimit(1)
9699
}
97100
}
98-
.lineLimit(1)
99101
}
100102
}
101103

0 commit comments

Comments
 (0)