Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tomkowz/Swifternalization
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1
Choose a base ref
...
head repository: tomkowz/Swifternalization
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jul 15, 2015

  1. Update docs

    tomkowz committed Jul 15, 2015
    Copy the full SHA
    50c4b94 View commit details
  2. Update README.md

    tomkowz committed Jul 15, 2015
    Copy the full SHA
    23dfd15 View commit details
  3. Update README.md

    tomkowz committed Jul 15, 2015
    Copy the full SHA
    103dd24 View commit details

Commits on Jul 18, 2015

  1. Add files with confirmed structure that represent expressions and tra…

    …nslatable key-value pairs
    tomkowz committed Jul 18, 2015
    Copy the full SHA
    6629288 View commit details

Commits on Jul 21, 2015

  1. Copy the full SHA
    e27e62d View commit details
  2. Rename file

    tomkowz committed Jul 21, 2015
    Copy the full SHA
    b2c82e8 View commit details
  3. Add Loader to the project

    tomkowz committed Jul 21, 2015
    Copy the full SHA
    5315ca6 View commit details
  4. Group files

    tomkowz committed Jul 21, 2015
    Copy the full SHA
    f1582e2 View commit details
  5. Copy the full SHA
    f947174 View commit details

Commits on Jul 26, 2015

  1. Copy the full SHA
    eed66f3 View commit details
  2. Add SharedExpressionsLoader

    tomkowz committed Jul 26, 2015
    Copy the full SHA
    3208b88 View commit details
  3. Processing translations - WIP

    tomkowz committed Jul 26, 2015
    Copy the full SHA
    5932213 View commit details

Commits on Jul 30, 2015

  1. Copy the full SHA
    78e15bb View commit details
  2. Copy the full SHA
    702e549 View commit details
  3. Copy the full SHA
    1034f9c View commit details
  4. Copy the full SHA
    08f2952 View commit details

Commits on Jul 31, 2015

  1. Copy the full SHA
    cd2aca9 View commit details
  2. Copy the full SHA
    e00c3db View commit details
  3. Copy the full SHA
    9b24d42 View commit details
  4. Copy the full SHA
    22943d3 View commit details
  5. Remove demo target

    tomkowz committed Jul 31, 2015
    Copy the full SHA
    6c3b81b View commit details

Commits on Aug 1, 2015

  1. Document the code

    tomkowz committed Aug 1, 2015
    Copy the full SHA
    e84a649 View commit details
  2. Copy the full SHA
    9c49bd2 View commit details
  3. Copy the full SHA
    58a5874 View commit details
  4. Update comments

    tomkowz committed Aug 1, 2015
    Copy the full SHA
    fa3f881 View commit details
  5. Convert project to Swift 2

    tomkowz committed Aug 1, 2015
    Copy the full SHA
    80d5432 View commit details
  6. Cleanup in project structure

    tomkowz committed Aug 1, 2015
    Copy the full SHA
    775b519 View commit details
  7. Cleanup in project structure

    tomkowz committed Aug 1, 2015
    Copy the full SHA
    966b58d View commit details

Commits on Aug 2, 2015

  1. Copy the full SHA
    e6367cb View commit details
  2. Merge branch 'feature/version-1-2' into feature/version1-2-swift2

    Conflicts:
    	Swifternalization.xcodeproj/project.pbxproj
    tomkowz committed Aug 2, 2015
    Copy the full SHA
    dceba18 View commit details
  3. Fix link

    tomkowz committed Aug 2, 2015
    Copy the full SHA
    abbaf98 View commit details
  4. Fix link

    tomkowz committed Aug 2, 2015
    Copy the full SHA
    6c96a7a View commit details
  5. Copy the full SHA
    0376ac6 View commit details
  6. Update podspec

    tomkowz committed Aug 2, 2015
    Copy the full SHA
    99b6106 View commit details
  7. Copy the full SHA
    e5d6f9c View commit details
  8. Copy the full SHA
    06c9f69 View commit details

Commits on Aug 24, 2015

  1. Copy the full SHA
    8820178 View commit details
  2. Copy the full SHA
    7a0f1e0 View commit details
  3. Copy the full SHA
    5845e16 View commit details
  4. Merge pull request #11 from Antondomashnev/master

    Add russian support
    tomkowz committed Aug 24, 2015
    Copy the full SHA
    b203c03 View commit details

Commits on Aug 25, 2015

  1. Copy the full SHA
    c3a786c View commit details
  2. Merge branch 'master' into swift2

    Conflicts:
    	Swifternalization.xcodeproj/project.pbxproj
    tomkowz committed Aug 25, 2015
    Copy the full SHA
    8ab949e View commit details

Commits on Nov 15, 2015

  1. Copy the full SHA
    b77ad6d View commit details
  2. Copy the full SHA
    19a6f0c View commit details
  3. Merge branch 'swift2'

    tomkowz committed Nov 15, 2015
    Copy the full SHA
    edf824d View commit details
  4. Update podspec

    tomkowz committed Nov 15, 2015
    Copy the full SHA
    05ae91d View commit details

Commits on Feb 13, 2016

  1. Suppresed few warnings

    tomkowz committed Feb 13, 2016
    Copy the full SHA
    8516b80 View commit details
  2. Added configureIfNeeded method so there is no necessity to call confi…

    …gure() if you want to configure it for main bundle
    tomkowz committed Feb 13, 2016
    Copy the full SHA
    4962b49 View commit details
  3. Update README.md

    tomkowz committed Feb 13, 2016
    Copy the full SHA
    48df2af View commit details
  4. Update podspec

    tomkowz committed Feb 13, 2016
    Copy the full SHA
    90b0535 View commit details
Showing with 11,052 additions and 8,844 deletions.
  1. +1 −0 .swift-version
  2. +0 −46 DemoOrdering/AppDelegate.swift
  3. +0 −10 DemoOrdering/Base.lproj/Expressions.strings
  4. +0 −12 DemoOrdering/Base.lproj/Localizable.strings
  5. +0 −38 DemoOrdering/Images.xcassets/AppIcon.appiconset/Contents.json
  6. +0 −40 DemoOrdering/Info.plist
  7. +0 −41 DemoOrdering/LaunchScreen.xib
  8. +0 −25 DemoOrdering/Main.storyboard
  9. +0 −34 DemoOrdering/ViewController.swift
  10. +0 −7 DemoOrdering/pl.lproj/Expressions.strings
  11. +0 −13 DemoOrdering/pl.lproj/Localizable.strings
  12. +372 −237 README.md
  13. +4 −6 Swifternalization.podspec
  14. +227 −245 Swifternalization.xcodeproj/project.pbxproj
  15. +8 −5 Swifternalization.xcodeproj/xcshareddata/xcschemes/Swifternalization.xcscheme
  16. +8 −5 Swifternalization.xcodeproj/xcshareddata/xcschemes/SwifternalizationTests.xcscheme
  17. +8 −0 Swifternalization/CountryCode.swift
  18. +56 −104 Swifternalization/Expression.swift
  19. +4 −4 Swifternalization/ExpressionMatcher.swift
  20. +3 −1 Swifternalization/ExpressionParser.swift
  21. +29 −0 Swifternalization/ExpressionPatternType.swift
  22. +7 −3 Swifternalization/InequalityExpressionMatcher.swift
  23. +10 −8 Swifternalization/InequalityExpressionParser.swift
  24. +9 −5 Swifternalization/InequalityExtendedExpressionMatcher.swift
  25. +3 −3 Swifternalization/InequalityExtendedExpressionParser.swift
  26. +22 −6 Swifternalization/InequalitySign.swift
  27. +2 −2 Swifternalization/Info.plist
  28. +10 −4 Swifternalization/InternalPattern.swift
  29. +74 −0 Swifternalization/JSONFileLoader.swift
  30. +0 −33 Swifternalization/KeyValue.swift
  31. +17 −0 Swifternalization/LengthVariation.swift
  32. +30 −0 Swifternalization/LoadedTranslation.swift
  33. +66 −0 Swifternalization/LoadedTranslationType.swift
  34. +118 −0 Swifternalization/LoadedTranslationsProcessor.swift
  35. +0 −112 Swifternalization/LocalizableFilesLoader.swift
  36. +21 −26 Swifternalization/Regex.swift
  37. +8 −4 Swifternalization/RegexExpressionMatcher.swift
  38. +7 −5 Swifternalization/RegexExpressionParser.swift
  39. +0 −29 Swifternalization/Shared Expressions/SharedBaseExpression.swift
  40. +0 −42 Swifternalization/Shared Expressions/SharedExpression.swift
  41. +41 −0 Swifternalization/SharedBaseExpression.swift
  42. +46 −0 Swifternalization/SharedExpression.swift
  43. +21 −0 Swifternalization/SharedExpressionLoader.swift
  44. +0 −140 Swifternalization/SharedExpressionsConfigurator.swift
  45. +111 −0 Swifternalization/SharedExpressionsProcessor.swift
  46. +8 −4 Swifternalization/{Shared Expressions → }/SharedPolishExpression.swift
  47. +59 −0 Swifternalization/SharedRussianExpression.swift
  48. +147 −196 Swifternalization/Swifternalization.swift
  49. +0 −69 Swifternalization/TranslatablePair.swift
  50. +58 −0 Swifternalization/Translation.swift
  51. +69 −0 Swifternalization/TranslationsLoader.swift
  52. +0 −12 SwifternalizationTests/Base.lproj/Expressions.strings
  53. +0 −21 SwifternalizationTests/Base.lproj/Localizable.strings
  54. +28 −0 SwifternalizationTests/ExpressionJSONs.swift
  55. +0 −53 SwifternalizationTests/ExpressionTests.swift
  56. +14 −14 SwifternalizationTests/InequalityExpressionMatcherTests.swift
  57. +12 −12 SwifternalizationTests/InequalityExpressionParserTests.swift
  58. +13 −13 SwifternalizationTests/InequalityExtendedExpressionMatcherTests.swift
  59. +13 −13 SwifternalizationTests/InequalityExtendedExpressionParserTests.swift
  60. +1 −1 SwifternalizationTests/Info.plist
  61. +51 −0 SwifternalizationTests/JSONFileLoaderTests.swift
  62. +125 −0 SwifternalizationTests/LoadedTranslationsProcessorTests.swift
  63. +0 −36 SwifternalizationTests/LocalizableFilesLoaderTests.swift
  64. +15 −0 SwifternalizationTests/NSBundle+TestExtension.swift
  65. +10 −10 SwifternalizationTests/RandomNumbers.swift
  66. +18 −8 SwifternalizationTests/SharedBaseExpressionTests.swift
  67. +18 −0 SwifternalizationTests/SharedExpressionsLoaderTests.swift
  68. +21 −0 SwifternalizationTests/SharedExpressionsProcessorTests.swift
  69. +4 −4 SwifternalizationTests/SharedPolishExpressionTests.swift
  70. +67 −0 SwifternalizationTests/SharedRussianExpressionTests.swift
  71. +18 −17 SwifternalizationTests/SwifternalizationTests.swift
  72. +8 −8 SwifternalizationTests/TranslatablePairTests.swift
  73. +56 −0 SwifternalizationTests/TranslationJSONs.swift
  74. +18 −0 SwifternalizationTests/TranslationsLoaderTests.swift
  75. +35 −0 SwifternalizationTests/base.json
  76. +21 −0 SwifternalizationTests/expressions.json
  77. +28 −0 SwifternalizationTests/pl.json
  78. +32 −0 SwifternalizationTests/ru.json
  79. 0 { → bin}/gendocs.sh
  80. +144 −86 docs/framework/Classes.html
  81. +0 −565 docs/framework/Classes/Expression.html
  82. +46 −135 docs/framework/Classes/InequalityExpressionParser.html
  83. +39 −63 docs/framework/Classes/InequalityExtendedExpressionParser.html
  84. +101 −149 ...t/Contents/Resources/Documents/Classes/LocalizableFilesLoader.html → Classes/JSONFileLoader.html}
  85. +319 −0 docs/framework/Classes/LoadedTranslationsProcessor.html
  86. +97 −24 docs/framework/Classes/Regex.html
  87. +32 −24 docs/framework/Classes/RegexExpressionParser.html
  88. +32 −24 docs/framework/Classes/SharedBaseExpression.html
  89. +0 −514 docs/framework/Classes/SharedExpressionsConfigurator.html
  90. +68 −36 docs/framework/{Enums/ValueType.html → Classes/SharedExpressionsLoader.html}
  91. +332 −0 docs/framework/Classes/SharedExpressionsProcessor.html
  92. +32 −24 docs/framework/Classes/SharedPolishExpression.html
  93. +239 −276 docs/framework/Classes/Swifternalization.html
  94. +0 −202 docs/framework/Classes/Swifternalization/Static.html
  95. +247 −0 docs/framework/Classes/TranslationsLoader.html
  96. +46 −69 docs/framework/Enums.html
  97. +51 −43 ...docset/Contents/Resources/Documents/Enums/ExpressionType.html → Enums/ExpressionPatternType.html}
  98. +58 −50 docs/framework/Enums/InequalitySign.html
  99. +42 −34 docs/framework/Enums/InternalPattern.html
  100. +327 −0 docs/framework/Enums/LoadedTranslationType.html
  101. +213 −0 docs/framework/Functions.html
  102. +34 −59 docs/framework/Protocols.html
  103. +32 −24 docs/framework/Protocols/ExpressionMatcher.html
  104. +33 −25 docs/framework/Protocols/ExpressionParser.html
  105. +34 −26 docs/framework/Protocols/SharedExpressionProtocol.html
  106. +142 −39 docs/framework/Structs.html
  107. +85 −113 ...tion.docset/Contents/Resources/Documents/Structs/TranslatablePair.html → Structs/Expression.html}
  108. +42 −80 docs/framework/Structs/InequalityExpressionMatcher.html
  109. +35 −27 docs/framework/Structs/InequalityExtendedExpressionMatcher.html
  110. +49 −40 ...on.docset/Contents/Resources/Documents/Enums/StringsFileType.html → Structs/LengthVariation.html}
  111. +54 −46 docs/framework/{Protocols/KeyValue.html → Structs/LoadedTranslation.html}
  112. +32 −24 docs/framework/Structs/RegexExpressionMatcher.html
  113. +43 −68 docs/framework/Structs/SharedExpression.html
  114. +304 −0 docs/framework/Structs/Translation.html
  115. +51 −130 docs/framework/Typealiases.html
  116. +144 −86 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Classes.html
  117. +0 −565 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Classes/Expression.html
  118. +46 −135 ...ets/Swifternalization.docset/Contents/Resources/Documents/Classes/InequalityExpressionParser.html
  119. +39 −63 ...ternalization.docset/Contents/Resources/Documents/Classes/InequalityExtendedExpressionParser.html
  120. +101 −149 ...html → docsets/Swifternalization.docset/Contents/Resources/Documents/Classes/JSONFileLoader.html}
  121. +319 −0 ...ts/Swifternalization.docset/Contents/Resources/Documents/Classes/LoadedTranslationsProcessor.html
  122. +97 −24 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Classes/Regex.html
  123. +32 −24 .../docsets/Swifternalization.docset/Contents/Resources/Documents/Classes/RegexExpressionParser.html
  124. +32 −24 ...k/docsets/Swifternalization.docset/Contents/Resources/Documents/Classes/SharedBaseExpression.html
  125. +0 −514 .../Swifternalization.docset/Contents/Resources/Documents/Classes/SharedExpressionsConfigurator.html
  126. +68 −36 ...docset/Contents/Resources/Documents/{Enums/ValueType.html → Classes/SharedExpressionsLoader.html}
  127. +332 −0 ...ets/Swifternalization.docset/Contents/Resources/Documents/Classes/SharedExpressionsProcessor.html
  128. +32 −24 ...docsets/Swifternalization.docset/Contents/Resources/Documents/Classes/SharedPolishExpression.html
  129. +239 −276 ...work/docsets/Swifternalization.docset/Contents/Resources/Documents/Classes/Swifternalization.html
  130. +0 −202 ...csets/Swifternalization.docset/Contents/Resources/Documents/Classes/Swifternalization/Static.html
  131. +247 −0 ...ork/docsets/Swifternalization.docset/Contents/Resources/Documents/Classes/TranslationsLoader.html
  132. +46 −69 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Enums.html
  133. +51 −43 ...→ docsets/Swifternalization.docset/Contents/Resources/Documents/Enums/ExpressionPatternType.html}
  134. +58 −50 ...framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Enums/InequalitySign.html
  135. +42 −34 ...ramework/docsets/Swifternalization.docset/Contents/Resources/Documents/Enums/InternalPattern.html
  136. +327 −0 ...rk/docsets/Swifternalization.docset/Contents/Resources/Documents/Enums/LoadedTranslationType.html
  137. +213 −0 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Functions.html
  138. +34 −59 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Protocols.html
  139. +32 −24 ...rk/docsets/Swifternalization.docset/Contents/Resources/Documents/Protocols/ExpressionMatcher.html
  140. +33 −25 ...ork/docsets/Swifternalization.docset/Contents/Resources/Documents/Protocols/ExpressionParser.html
  141. +34 −26 ...ets/Swifternalization.docset/Contents/Resources/Documents/Protocols/SharedExpressionProtocol.html
  142. +142 −39 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Structs.html
  143. +85 −113 ...air.html → docsets/Swifternalization.docset/Contents/Resources/Documents/Structs/Expression.html}
  144. +42 −80 ...ts/Swifternalization.docset/Contents/Resources/Documents/Structs/InequalityExpressionMatcher.html
  145. +35 −27 ...ernalization.docset/Contents/Resources/Documents/Structs/InequalityExtendedExpressionMatcher.html
  146. +49 −40 ...tml → docsets/Swifternalization.docset/Contents/Resources/Documents/Structs/LengthVariation.html}
  147. +54 −46 ...on.docset/Contents/Resources/Documents/{Protocols/KeyValue.html → Structs/LoadedTranslation.html}
  148. +32 −24 ...docsets/Swifternalization.docset/Contents/Resources/Documents/Structs/RegexExpressionMatcher.html
  149. +43 −68 ...ework/docsets/Swifternalization.docset/Contents/Resources/Documents/Structs/SharedExpression.html
  150. +304 −0 .../framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Structs/Translation.html
  151. +51 −130 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/Typealiases.html
  152. +395 −214 docs/framework/docsets/Swifternalization.docset/Contents/Resources/Documents/index.html
  153. BIN docs/framework/docsets/Swifternalization.docset/Contents/Resources/docSet.dsidx
  154. BIN docs/framework/docsets/Swifternalization.tgz
  155. +395 −214 docs/framework/index.html
  156. +10 −21 docs/public/Classes.html
  157. +165 −82 docs/public/Classes/Swifternalization.html
  158. +2 −2 docs/public/Typealiases.html
  159. +10 −21 docs/public/docsets/Swifternalization Public API.docset/Contents/Resources/Documents/Classes.html
  160. +165 −82 ...s/Swifternalization Public API.docset/Contents/Resources/Documents/Classes/Swifternalization.html
  161. +2 −2 .../public/docsets/Swifternalization Public API.docset/Contents/Resources/Documents/Typealiases.html
  162. +364 −191 docs/public/docsets/Swifternalization Public API.docset/Contents/Resources/Documents/index.html
  163. BIN docs/public/docsets/Swifternalization Public API.docset/Contents/Resources/docSet.dsidx
  164. BIN docs/public/docsets/Swifternalization Public API.tgz
  165. +364 −191 docs/public/index.html
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.0
46 changes: 0 additions & 46 deletions DemoOrdering/AppDelegate.swift

This file was deleted.

10 changes: 0 additions & 10 deletions DemoOrdering/Base.lproj/Expressions.strings

This file was deleted.

12 changes: 0 additions & 12 deletions DemoOrdering/Base.lproj/Localizable.strings

This file was deleted.

38 changes: 0 additions & 38 deletions DemoOrdering/Images.xcassets/AppIcon.appiconset/Contents.json

This file was deleted.

40 changes: 0 additions & 40 deletions DemoOrdering/Info.plist

This file was deleted.

41 changes: 0 additions & 41 deletions DemoOrdering/LaunchScreen.xib

This file was deleted.

25 changes: 0 additions & 25 deletions DemoOrdering/Main.storyboard

This file was deleted.

34 changes: 0 additions & 34 deletions DemoOrdering/ViewController.swift

This file was deleted.

7 changes: 0 additions & 7 deletions DemoOrdering/pl.lproj/Expressions.strings

This file was deleted.

13 changes: 0 additions & 13 deletions DemoOrdering/pl.lproj/Localizable.strings

This file was deleted.

Loading