Merge branch 'master' into BPUB-576-myr-currency-support

This commit is contained in:
rpanak-generalbytes 2018-05-28 14:29:08 +02:00 committed by GitHub
commit c347abd508
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions

2
.gitignore vendored
View File

@ -12,4 +12,4 @@ install-libs.sh
..gitignore.swp ..gitignore.swp
.project .project
.classpath .classpath
.settings/ .settings/

View File

@ -44,4 +44,4 @@ if (hasProperty('gbArtifactoryUser') && hasProperty('gbArtifactoryPassword') &&
} }
} }
} }
} }

View File

@ -141,7 +141,7 @@ public enum Country {
LT("LT", "LTU", "Lithuania"), LT("LT", "LTU", "Lithuania"),
LU("LU", "LUX", "Luxembourg"), LU("LU", "LUX", "Luxembourg"),
MO("MO", "MAC", "Macao"), MO("MO", "MAC", "Macao"),
MK("MK", "MKD", "Macedonia (the former Yugoslav Republic of)"), MK("MK", "MKD", "Macedonia"),
MG("MG", "MDG", "Madagascar"), MG("MG", "MDG", "Madagascar"),
MW("MW", "MWI", "Malawi"), MW("MW", "MWI", "Malawi"),
MY("MY", "MYS", "Malaysia"), MY("MY", "MYS", "Malaysia"),

View File

@ -57,6 +57,7 @@ public class Currencies {
public static final String GBP = "GBP"; public static final String GBP = "GBP";
public static final String HUF = "HUF"; public static final String HUF = "HUF";
public static final String JPY = "JPY"; public static final String JPY = "JPY";
public static final String MKD = "MKD";
public static final String MYR = "MYR"; public static final String MYR = "MYR";
public static final String SGD = "SGD"; public static final String SGD = "SGD";
public static final String USD = "USD"; public static final String USD = "USD";
@ -104,6 +105,7 @@ public class Currencies {
fiat.add(GBP); fiat.add(GBP);
fiat.add(HUF); fiat.add(HUF);
fiat.add(JPY); fiat.add(JPY);
fiat.add(MKD);
fiat.add(MYR); fiat.add(MYR);
fiat.add(SGD); fiat.add(SGD);
fiat.add(USD); fiat.add(USD);