Skip to content
This repository has been archived by the owner on Sep 6, 2018. It is now read-only.

Strings: multiple tables support #49

Merged
merged 6 commits into from
May 28, 2017
Merged

Strings: multiple tables support #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3704fd8
Fixture changes due to multiple tables support
djbe May 22, 2017
fff46a4
Update structured templates and output
djbe May 22, 2017
e6d17c5
update flat templates and output
djbe May 22, 2017
1c275fd
better (correct) empty check
djbe May 22, 2017
e6cfd4b
Add a multiple files context and swift output
djbe May 24, 2017
e610d2f
Update docs
djbe May 24, 2017
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
9 changes: 1 addition & 8 deletions Contexts/Strings/empty.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,6 @@
<plist version="1.0">
<dict>
<key>tables</key>
<array>
<dict>
<key>levels</key>
<dict/>
<key>name</key>
<string>Localizable</string>
</dict>
</array>
<array/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Contexts/Strings/multiline.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Key</string>
</array>
</dict>
<key>name</key>
<string>Localizable</string>
<string>LocMultiline</string>
</dict>
</array>
</dict>
Expand Down
296 changes: 296 additions & 0 deletions Contexts/Strings/multiple.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,296 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>tables</key>
<array>
<dict>
<key>levels</key>
<dict>
<key>children</key>
<array>
<dict>
<key>name</key>
<string>Apples</string>
<key>strings</key>
<array>
<dict>
<key>key</key>
<string>apples.count</string>
<key>name</key>
<string>count</string>
<key>translation</key>
<string>You have %d apples</string>
<key>types</key>
<array>
<string>Int</string>
</array>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>Bananas</string>
<key>strings</key>
<array>
<dict>
<key>key</key>
<string>bananas.owner</string>
<key>name</key>
<string>owner</string>
<key>translation</key>
<string>Those %d bananas belong to %@.</string>
<key>types</key>
<array>
<string>Int</string>
<string>String</string>
</array>
</dict>
</array>
</dict>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>children</key>
<array>
<dict>
<key>name</key>
<string>Is</string>
<key>strings</key>
<array>
<dict>
<key>key</key>
<string>settings.navigation-bar.title.deeper.than.we.can.handle.no.really.this.is.deep</string>
<key>name</key>
<string>deep</string>
<key>translation</key>
<string>DeepSettings</string>
</dict>
</array>
</dict>
</array>
<key>name</key>
<string>This</string>
</dict>
</array>
<key>name</key>
<string>Really</string>
</dict>
</array>
<key>name</key>
<string>No</string>
</dict>
</array>
<key>name</key>
<string>Handle</string>
</dict>
</array>
<key>name</key>
<string>Can</string>
</dict>
</array>
<key>name</key>
<string>We</string>
</dict>
</array>
<key>name</key>
<string>Than</string>
</dict>
</array>
<key>name</key>
<string>Deeper</string>
</dict>
<dict>
<key>name</key>
<string>Even</string>
<key>strings</key>
<array>
<dict>
<key>key</key>
<string>settings.navigation-bar.title.even.deeper</string>
<key>name</key>
<string>deeper</string>
<key>translation</key>
<string>Settings</string>
</dict>
</array>
</dict>
</array>
<key>name</key>
<string>Title</string>
</dict>
</array>
<key>name</key>
<string>Navigation_Bar</string>
<key>strings</key>
<array>
<dict>
<key>key</key>
<string>settings.navigation-bar.self</string>
<key>name</key>
<string>self</string>
<key>translation</key>
<string>Some Reserved Keyword there</string>
</dict>
</array>
</dict>
<dict>
<key>name</key>
<string>User_Profile_Section</string>
<key>strings</key>
<array>
<dict>
<key>key</key>
<string>seTTings.uSer-proFile-sectioN.footer_text</string>
<key>name</key>
<string>footer_text</string>
<key>translation</key>
<string>Here you can change some user profile settings.</string>
</dict>
<dict>
<key>key</key>
<string>SETTINGS.USER_PROFILE_SECTION.HEADER_TITLE</string>
<key>name</key>
<string>HEADER_TITLE</string>
<key>translation</key>
<string>User Profile Settings</string>
</dict>
</array>
</dict>
</array>
<key>name</key>
<string>Settings</string>
</dict>
</array>
<key>strings</key>
<array>
<dict>
<key>key</key>
<string>alert_message</string>
<key>name</key>
<string>alert_message</string>
<key>translation</key>
<string>Some alert body there</string>
</dict>
<dict>
<key>key</key>
<string>alert_title</string>
<key>name</key>
<string>alert_title</string>
<key>translation</key>
<string>Title of the alert</string>
</dict>
<dict>
<key>key</key>
<string>ObjectOwnership</string>
<key>name</key>
<string>ObjectOwnership</string>
<key>translation</key>
<string>These are %3$@'s %1$d %2$@.</string>
<key>types</key>
<array>
<string>Int</string>
<string>String</string>
<string>String</string>
</array>
</dict>
<dict>
<key>key</key>
<string>private</string>
<key>name</key>
<string>private</string>
<key>translation</key>
<string>Hello, my name is %@ and I'm %d</string>
<key>types</key>
<array>
<string>String</string>
<string>Int</string>
</array>
</dict>
</array>
</dict>
<key>name</key>
<string>Localizable</string>
</dict>
<dict>
<key>levels</key>
<dict>
<key>strings</key>
<array>
<dict>
<key>key</key>
<string>MULTILINE</string>
<key>name</key>
<string>MULTILINE</string>
<key>translation</key>
<string>multi\nline</string>
</dict>
<dict>
<key>key</key>
<string>multiLine\nKey</string>
<key>name</key>
<string>multiLine
Key</string>
<key>translation</key>
<string>test</string>
</dict>
<dict>
<key>key</key>
<string>MULTILINE2</string>
<key>name</key>
<string>MULTILINE2</string>
<key>translation</key>
<string>another\nmulti\n line</string>
</dict>
<dict>
<key>key</key>
<string>SINGLELINE</string>
<key>name</key>
<string>SINGLELINE</string>
<key>translation</key>
<string>single line</string>
</dict>
<dict>
<key>key</key>
<string>SINGLELINE2</string>
<key>name</key>
<string>SINGLELINE2</string>
<key>translation</key>
<string>another single line</string>
</dict>
</array>
</dict>
<key>name</key>
<string>LocMultiline</string>
</dict>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion Contexts/Strings/structuredonly.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
</array>
</dict>
<key>name</key>
<string>Localizable</string>
<string>LocStructuredOnly</string>
</dict>
</array>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion Contexts/Strings/utf8.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
</array>
</dict>
<key>name</key>
<string>Localizable</string>
<string>LocUTF8</string>
</dict>
</array>
</dict>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/strings/flat-swift2.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ enum L10n {

```swift
// Simple strings
let message = L10n.AlertMessage.string
let title = tr(.AlertTitle)
let message = L10n.AlertMessage
let title = L10n.AlertTitle

// with parameters, note that each argument needs to be of the correct type
let apples = L10n.ApplesCount(3)
Expand Down
4 changes: 2 additions & 2 deletions Documentation/strings/flat-swift3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ enum L10n {

```swift
// Simple strings
let message = L10n.alertMessage.string
let title = tr(.alertTitle)
let message = L10n.alertMessage
let title = L10n.alertTitle

// with parameters, note that each argument needs to be of the correct type
let apples = L10n.applesCount(3)
Expand Down
Loading