-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'gradle-kotlin-dsl' of github.com:allegro/tradukisto int…
…o gradle-kotlin-dsl
- Loading branch information
Showing
13 changed files
with
438 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,8 @@ | ||
| name: Build | ||
|
|
||
| on: | ||
| pull_request: | ||
| push: | ||
| tags-ignore: | ||
| - 'v*' | ||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: write | ||
|
|
@@ -18,10 +16,11 @@ jobs: | |
| matrix: | ||
| java: ['8', '11', '17'] | ||
|
|
||
| name: Run tests for Java ${{ matrix.java }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Set up ${{ matrix.java }} | ||
| - name: Set up Java ${{ matrix.java }} | ||
| uses: actions/setup-java@v3 | ||
| with: | ||
| distribution: 'temurin' | ||
|
|
@@ -41,19 +40,19 @@ jobs: | |
| - name: Upload coverage to Codecov | ||
| if: matrix.Java == '17' | ||
| uses: codecov/codecov-action@v3 | ||
|
|
||
| dependabot: | ||
| runs-on: ubuntu-latest | ||
| if: ${{ github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' }} | ||
| needs: build | ||
|
|
||
| steps: | ||
| - name: Dependabot metadata | ||
| id: metadata | ||
| uses: dependabot/[email protected] | ||
| with: | ||
| github-token: "${{ secrets.GITHUB_TOKEN }}" | ||
|
|
||
| - name: Enable auto-merge for Dependabot PRs | ||
| run: gh pr merge --auto --merge "$PR_URL" | ||
| env: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
.../pl/allegro/finance/tradukisto/internal/languages/dutch/DutchIntegerToWordsConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package pl.allegro.finance.tradukisto.internal.languages.dutch; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import pl.allegro.finance.tradukisto.internal.GenderAwareIntegerToStringConverter; | ||
| import pl.allegro.finance.tradukisto.internal.IntegerToStringConverter; | ||
| import pl.allegro.finance.tradukisto.internal.NumberProcessor; | ||
|
|
||
| public class DutchIntegerToWordsConverter implements IntegerToStringConverter { | ||
|
|
||
| private final IntegerToStringConverter bigNumbersConverter; | ||
| private final Map<Integer, String> exceptions; | ||
| private final GenderAwareIntegerToStringConverter smallNumbersConverter; | ||
|
|
||
| public DutchIntegerToWordsConverter(IntegerToStringConverter bigNumbersConverter, | ||
| Map<Integer, String> exceptions, | ||
| GenderAwareIntegerToStringConverter smallNumbersConverter) { | ||
| this.bigNumbersConverter = bigNumbersConverter; | ||
| this.exceptions = exceptions; | ||
| this.smallNumbersConverter = smallNumbersConverter; | ||
| } | ||
|
|
||
| @Override | ||
| public String asWords(Integer value) { | ||
| if (exceptions.containsKey(value)) { | ||
| return exceptions.get(value); | ||
| } | ||
|
|
||
| Integer bigNumber = value / 1000000; | ||
| Integer smallNumber = value % 1000000; | ||
|
|
||
| return new NumberProcessor(bigNumbersConverter, smallNumbersConverter).process(bigNumber, smallNumber); | ||
| } | ||
|
|
||
| } |
26 changes: 26 additions & 0 deletions
26
src/main/java/pl/allegro/finance/tradukisto/internal/languages/dutch/DutchPluralForms.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package pl.allegro.finance.tradukisto.internal.languages.dutch; | ||
|
|
||
| import pl.allegro.finance.tradukisto.internal.languages.GenderType; | ||
| import pl.allegro.finance.tradukisto.internal.languages.PluralForms; | ||
|
|
||
| /** | ||
| * @author Dilaver Demirel | ||
| */ | ||
| public class DutchPluralForms implements PluralForms { | ||
|
|
||
| private final String form; | ||
|
|
||
| public DutchPluralForms(String form) { | ||
| this.form = form; | ||
| } | ||
|
|
||
| @Override | ||
| public String formFor(Integer value) { | ||
| return form; | ||
| } | ||
|
|
||
| @Override | ||
| public GenderType genderType() { | ||
| return GenderType.NON_APPLICABLE; | ||
| } | ||
| } |
78 changes: 78 additions & 0 deletions
78
...pl/allegro/finance/tradukisto/internal/languages/dutch/DutchThousandToWordsConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| package pl.allegro.finance.tradukisto.internal.languages.dutch; | ||
|
|
||
| import pl.allegro.finance.tradukisto.internal.support.Range; | ||
| import pl.allegro.finance.tradukisto.internal.GenderAwareIntegerToStringConverter; | ||
| import pl.allegro.finance.tradukisto.internal.languages.GenderForms; | ||
| import pl.allegro.finance.tradukisto.internal.languages.GenderType; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import static java.lang.String.format; | ||
| public class DutchThousandToWordsConverter implements GenderAwareIntegerToStringConverter { | ||
|
|
||
| private final Map<Integer, GenderForms> baseValues; | ||
|
|
||
| public DutchThousandToWordsConverter(Map<Integer, GenderForms> baseValues) { | ||
| this.baseValues = baseValues; | ||
| } | ||
|
|
||
| @Override | ||
| public String asWords(Integer value, GenderType genderType) { | ||
| if (baseValues.containsKey(value)) { | ||
| return baseValues.get(value).formFor(genderType); | ||
| } else if (Range.closed(21, 99).contains(value)) { | ||
| return twoDigitsNumberAsString(value, genderType); | ||
| } else if (Range.closed(101, 999).contains(value)) { | ||
| return threeDigitsNumberAsString(value, genderType); | ||
| } else if (Range.closed(1000, 999999).contains(value)) { | ||
| return thousandsAsString(value, genderType); | ||
| } | ||
|
|
||
| throw new IllegalArgumentException(format("Can't convert %d", value)); | ||
| } | ||
|
|
||
| private String twoDigitsNumberAsString(Integer value, GenderType genderType) { | ||
| Integer units = value % 10; | ||
| Integer tens = value - units; | ||
|
|
||
| // When units are 2 or 3, between the tens and the units | ||
| if (units == 2 || units == 3) { | ||
| return format("%sën%s", asWords(units, genderType), asWords(tens, genderType)); | ||
| } else { | ||
| return format("%sen%s", asWords(units, genderType), asWords(tens, genderType)); | ||
| } | ||
| } | ||
|
|
||
| private String threeDigitsNumberAsString(Integer value, GenderType genderType) { | ||
| Integer tensWithUnits = value % 100; | ||
| Integer hundreds = value - tensWithUnits; | ||
|
|
||
| return format("%s%s", asWords(hundreds, genderType), asWords(tensWithUnits, genderType)); | ||
| } | ||
|
|
||
| private String thousandsAsString(Integer value, GenderType genderType) { | ||
| Integer thousands = value / 1000; | ||
| Integer other = value % 1000; | ||
|
|
||
| if (isOneThousand(thousands)) { | ||
| return getOneThousandAsWords(other, genderType); | ||
| } | ||
|
|
||
| return getThousandsAsWords(thousands, other, genderType); | ||
| } | ||
|
|
||
| private String getThousandsAsWords(Integer thousands, Integer other, GenderType genderType) { | ||
| if (other == 0) { | ||
| return format("%sduizend", asWords(thousands, genderType)); | ||
| } | ||
| return format("%sduizend%s", asWords(thousands, genderType), asWords(other, genderType)); | ||
| } | ||
|
|
||
| private String getOneThousandAsWords(Integer other, GenderType genderType) { | ||
| return format("duizend%s", asWords(other, genderType)); | ||
| } | ||
|
|
||
| private boolean isOneThousand(Integer thousands) { | ||
| return thousands == 1; | ||
| } | ||
| } |
72 changes: 72 additions & 0 deletions
72
src/main/java/pl/allegro/finance/tradukisto/internal/languages/dutch/DutchValues.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package pl.allegro.finance.tradukisto.internal.languages.dutch; | ||
|
|
||
| import static pl.allegro.finance.tradukisto.internal.support.BaseNumbersBuilder.baseNumbersBuilder; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import pl.allegro.finance.tradukisto.internal.languages.GenderForms; | ||
| import pl.allegro.finance.tradukisto.internal.languages.PluralForms; | ||
|
|
||
| import static java.util.Collections.singletonMap; | ||
|
|
||
|
|
||
| public class DutchValues { | ||
|
|
||
| public Map<Integer, GenderForms> baseNumbers() { | ||
| return baseNumbersBuilder() | ||
| .put(0, "nul") | ||
| .put(1, "één") | ||
| .put(2, "twee") | ||
| .put(3, "drie") | ||
| .put(4, "vier") | ||
| .put(5, "vijf") | ||
| .put(6, "zes") | ||
| .put(7, "zeven") | ||
| .put(8, "acht") | ||
| .put(9, "negen") | ||
| .put(10, "tien") | ||
| .put(11, "elf") | ||
| .put(12, "twaalf") | ||
| .put(13, "dertien") | ||
| .put(14, "veertien") | ||
| .put(15, "vijftien") | ||
| .put(16, "zestien") | ||
| .put(17, "zeventien") | ||
| .put(18, "achttien") | ||
| .put(19, "negentien") | ||
| .put(20, "twintig") | ||
| .put(30, "dertig") | ||
| .put(40, "veertig") | ||
| .put(50, "vijftig") | ||
| .put(60, "zestig") | ||
| .put(70, "zeventig") | ||
| .put(80, "tachtig") | ||
| .put(90, "negentig") | ||
| .put(100, "honderd") | ||
| .put(200, "tweehonderd") | ||
| .put(300, "driehonderd") | ||
| .put(400, "vierhonderd") | ||
| .put(500, "vijfhonderd") | ||
| .put(600, "zeshonderd") | ||
| .put(700, "zevenhonderd") | ||
| .put(800, "achthonderd") | ||
| .put(900, "negenhonderd") | ||
| .build(); | ||
| } | ||
|
|
||
| public Map<Integer, String> exceptions() { | ||
| return singletonMap(1000, "duizend"); | ||
| } | ||
|
|
||
| public List<PluralForms> pluralForms() { | ||
| return Arrays.asList( | ||
| new DutchPluralForms("miljoen"), | ||
| new DutchPluralForms("miljard")); | ||
| } | ||
|
|
||
| public String currency() { | ||
| return "€"; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.