Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@

## master

### Fixed

- Incorrect file name when specified with _.strings_ suffix ([#39](https://github.com/AckeeCZ/ACKLocalization/pull/39), kudos to @vendulasvastal)

## 1.6.0

### Added
Expand Down
3 changes: 1 addition & 2 deletions Sources/ACKLocalizationCore/ACKLocalization.swift
Original file line number Diff line number Diff line change
Expand Up @@ -462,8 +462,7 @@ public final class ACKLocalization {
extension String {
func removingSuffix(_ suffix: String) -> String {
guard hasSuffix(suffix) else { return self }

return String(self[...index(endIndex, offsetBy: -suffix.count)])
return String(dropLast(suffix.count))
}
}

Expand Down
7 changes: 6 additions & 1 deletion Tests/ACKLocalizationCoreTests/ACKLocalizationTests.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ACKLocalizationCore
@testable import ACKLocalizationCore
import XCTest

final class ACKLocalizationTests: XCTestCase {
Expand Down Expand Up @@ -40,4 +40,9 @@ final class ACKLocalizationTests: XCTestCase {
]
XCTAssertNoThrow(try localization.checkDuplicateKeys(form: locRow))
}

func testRemovingSuffix() {
var fileName = "Localizable.strings"
XCTAssertEqual("Localizable", fileName.removingSuffix(".strings"))
}
}