Skip to content

feat: Apple String Catalog Support #2893

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

Merged
merged 12 commits into from
Feb 13, 2025
Merged

feat: Apple String Catalog Support #2893

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3f4562d
WIP export works
neo773 Feb 4, 2025
d4d288e
WIP add import
neo773 Feb 4, 2025
25ac114
add tests
neo773 Feb 4, 2025
c85f49e
fix: Remove duplicate Apple .xcstrings export format entry in de.json
neo773 Feb 4, 2025
4404489
add changes
neo773 Feb 5, 2025
872e7c3
add changes and run ktlint
neo773 Feb 5, 2025
6f20044
Rename XCSTRINGS import format to APPLE_XCSTRINGS
neo773 Feb 5, 2025
9ef91f7
Merge remote-tracking branch 'upstream/main'
neo773 Feb 7, 2025
47812b9
fix translation states and add description
neo773 Feb 8, 2025
b6d42aa
parse translationState
neo773 Feb 9, 2025
5e8b8c2
add test and fix: Use xcstrings key as base translation when missing
neo773 Feb 9, 2025
f87a038
add changes and remove translation state
neo773 Feb 10, 2025
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
10 changes: 5 additions & 5 deletions backend/data/src/main/kotlin/io/tolgee/formats/ExportFormat.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ enum class ExportFormat(
"application/x-xliff+xml",
defaultFileStructureTemplate = "{languageTag}.{extension}",
),
APPLE_XCSTRINGS(
"xcstrings",
"application/json",
defaultFileStructureTemplate = "Localizable.{extension}",
),
ANDROID_XML(
"xml",
"application/xml",
Expand All @@ -48,4 +43,9 @@ enum class ExportFormat(
CSV("csv", "text/csv"),
RESX_ICU("resx", "text/microsoft-resx"),
XLSX("xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"),
APPLE_XCSTRINGS(
"xcstrings",
"application/json",
defaultFileStructureTemplate = "Localizable.{extension}",
),
}
4 changes: 1 addition & 3 deletions backend/data/src/main/kotlin/io/tolgee/service/dataImport/processors/FileProcessorContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ data class FileProcessorContext(

val key = getOrCreateKey(keyName)
metadata?.let { meta ->
meta["comment"]?.takeIf { it is String }?.let {
addKeyDescription(keyName, it as String)
}
addKeyDescription(keyName, meta["comment"]?.toString())
}
return
}
Expand Down
37 changes: 16 additions & 21 deletions backend/data/src/main/kotlin/io/tolgee/service/export/ExportFilePathProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.ibm.icu.util.ULocale
import io.tolgee.constants.Message
import io.tolgee.dtos.IExportParams
import io.tolgee.exceptions.BadRequestException
import io.tolgee.formats.ExportFormat
import io.tolgee.service.export.dataProvider.ExportTranslationView

class ExportFilePathProvider(
Expand All @@ -18,14 +19,6 @@ class ExportFilePathProvider(
languageTag: String? = null,
replaceExtension: Boolean = true,
): String {
// If no template is provided, use a default template for xcstrings
if (params.fileStructureTemplate == null) {
return when {
namespace.isNullOrEmpty() -> "Localizable.xcstrings"
else -> "$namespace.xcstrings"
}
}

val template = validateAndGetTemplate()
return template
.replacePlaceholder(ExportFilePathPlaceholder.NAMESPACE, namespace ?: "")
Expand Down Expand Up @@ -60,19 +53,21 @@ class ExportFilePathProvider(
}

private fun validateTemplate() {
val containsLanguageTag =
arrayOf(
ExportFilePathPlaceholder.LANGUAGE_TAG,
ExportFilePathPlaceholder.ANDROID_LANGUAGE_TAG,
ExportFilePathPlaceholder.SNAKE_LANGUAGE_TAG,
).any { getTemplate().contains(it.placeholder) }

if (!containsLanguageTag) {
throw getMissingPlaceholderException(
ExportFilePathPlaceholder.LANGUAGE_TAG,
ExportFilePathPlaceholder.ANDROID_LANGUAGE_TAG,
ExportFilePathPlaceholder.SNAKE_LANGUAGE_TAG,
)
if (params.format !in listOf(ExportFormat.APPLE_XCSTRINGS)) {
val containsLanguageTag =
arrayOf(
ExportFilePathPlaceholder.LANGUAGE_TAG,
ExportFilePathPlaceholder.ANDROID_LANGUAGE_TAG,
ExportFilePathPlaceholder.SNAKE_LANGUAGE_TAG,
).any { getTemplate().contains(it.placeholder) }

if (!containsLanguageTag) {
throw getMissingPlaceholderException(
ExportFilePathPlaceholder.LANGUAGE_TAG,
ExportFilePathPlaceholder.ANDROID_LANGUAGE_TAG,
ExportFilePathPlaceholder.SNAKE_LANGUAGE_TAG,
)
}
}

val containsExtension = getTemplate().contains(ExportFilePathPlaceholder.EXTENSION.placeholder)
Expand Down
Loading