From dd9f7736cc3c98fb6a0e4ce174c515ee2d7a58a8 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:23:08 +0000 Subject: [PATCH 01/20] Added Changelog file from Proper Brgdbald --- Changes.org | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 Changes.org diff --git a/Changes.org b/Changes.org new file mode 100644 index 0000000..fdb1b43 --- /dev/null +++ b/Changes.org @@ -0,0 +1,58 @@ +Changelog file by Proper Brgdbald for unit updates + +* 2023-08-07 + +Inches H2O based from wikipedia (https://en.wikipedia.org/wiki/Inch_of_water) +mm H2O based on Inches H2O divided by 25.4 + or https://en.wikipedia.org/wiki/Centimetre_of_water + Therefore conventional value +inHg based from mmHg but multiplied by 25.4 per wikipedia https://en.wikipedia.org/wiki/Inch + +String translations are not perfect, please let me know. + + +Main conversion files changed where units are defined and converted. +- /app/src/main/java/com/physphil/android/unitconverterultimate/ + - [X] /util/Conversions.java + - [-] /models/Conversion.java + - [ ] apparently no units spec'd + - [X] partly completing for reference I checked this + - [X] /models/Unit.java +- /v6000/src/main/java/com/physphil/android/unitconverterultimate/ + - [-] ConversionFragment.kt + - [ ] apparently no units spec'd + - [X] partly completing for reference I checked this + - [ ] /conversion/ConversionRepository.kt + - Did not see need to change + + +I did not change the files underneath /app/src/test or /v6000/src/test. + + +List of files changed that contained "metre" and therefore other units: +- [X] ‎app/src + - [X] /main/java/com/physphil/android/unitconverterultimate/models/Unit.java + - [X] ‎/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java +- [X] v6000/src + - [X] /main/java/com/physphil/android/unitconverterultimate/models/Unit.kt + - [X] /main/java/com/physphil/android/unitconverterultimate/data/DataSource.kt + - [X] /main/res/values/strings.xml +- [X] app/src/main/res + - [X] ‎/values/strings.xml + - [X] ‎/values-it/strings.xml + - [X] ‎/values-es/strings.xml + - [X] ‎/values-ru/strings.xml need translation + - Attempted with other units as sample + - [X] ‎/values-hr/strings.xml + - [X] ‎/values-hu/strings.xml need translation + - Attempted with other units as sample + - [X] ‎/values-fr/strings.xml + - [X] ‎/values-pt-rBR/strings.xml + - [X] ‎/values-nl/strings.xml + - [X] /values-tr/strings.xml + - [X] ‎/values-fa/strings.xml + - need help with translation and file formatting (Right Justified) + - Attempted with other units as sample + - [X] /values-de/strings.xml + - [X] /values-ja/strings.xml + - [X] ‎/values-nb/strings.xml From 9c5cd36ef20cc7143369f11e42f6e6306fdd234a Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:43:37 +0000 Subject: [PATCH 02/20] Updated to add water and mercury column units --- .../physphil/android/unitconverterultimate/models/Unit.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java b/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java index b39580b..813112c 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.java @@ -140,6 +140,9 @@ public class Unit { public static final int TECHNICAL_ATMOSPHERE = 709; public static final int MMHG = 707; public static final int TORR = 708; + public static final int MMH2O = 709; + public static final int INHG = 710; + public static final int INH2O = 711; public static final int KM_HR = 800; public static final int MPH = 801; @@ -198,7 +201,7 @@ public class Unit { KILOMETRE, MILE, METRE, CENTIMETRE, MILLIMETRE, MICROMETRE, NANOMETRE, YARD, FEET, INCH, NAUTICAL_MILE, FURLONG, LIGHT_YEAR, KILOGRAM, POUND, GRAM, MILLIGRAM, OUNCE, GRAIN, STONE, METRIC_TON, SHORT_TON, LONG_TON, WATT, KILOWATT, MEGAWATT, HP, HP_UK, FT_LBF_S, CALORIE_S, BTU_S, KVA, - MEGAPASCAL, KILOPASCAL, PASCAL, BAR, PSI, PSF, ATMOSPHERE, TECHNICAL_ATMOSPHERE, MMHG, TORR, + MEGAPASCAL, KILOPASCAL, PASCAL, BAR, PSI, PSF, ATMOSPHERE, TECHNICAL_ATMOSPHERE, MMHG, TORR, MMH2O, INHG, INH2O, KM_HR, MPH, M_S, FPS, KNOT, CELSIUS, FAHRENHEIT, KELVIN, RANKINE, DELISLE, NEWTON, REAUMUR, ROMER, GAS_MARK, YEAR, MONTH, WEEK, DAY, HOUR, MINUTE, SECOND, MILLISECOND, NANOSECOND, From 3333815c422d5d7ea924417fac0d9dc3706471e2 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:46:43 +0000 Subject: [PATCH 03/20] Updated to add water and mercury column units --- .../android/unitconverterultimate/util/Conversions.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java b/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java index a2faa64..68aea40 100644 --- a/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java +++ b/app/src/main/java/com/physphil/android/unitconverterultimate/util/Conversions.java @@ -304,6 +304,9 @@ private void getPressureConversions() { units.add(new Unit(TECHNICAL_ATMOSPHERE, R.string.technical_atmosphere, 98066.5, 0.0000101971621297792824257)); units.add(new Unit(MMHG, R.string.mmhg, 133.322387415, 0.007500615758456563339513)); units.add(new Unit(TORR, R.string.torr, 133.3223684210526315789, 0.00750061682704169751)); + units.add(new Unit(MMH2O, R.string.mmh2o, 9.806650, 0.1019716)); + units.add(new Unit(INHG, R.string.inhg, 3386.388640341, 0.00029529983)); + units.add(new Unit(INH2O, R.string.inh2o, 249.0889, 0.0040146309)); addConversion(Conversion.PRESSURE, new Conversion(Conversion.PRESSURE, R.string.pressure, units)); } From 9fec42e5d9053ac79973b208f6cb2a0e029e0b04 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:49:32 +0000 Subject: [PATCH 04/20] Updated to add water and mercury column units --- .../physphil/android/unitconverterultimate/models/Unit.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/v6000/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.kt b/v6000/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.kt index 90b7b7b..a612124 100644 --- a/v6000/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.kt +++ b/v6000/src/main/java/com/physphil/android/unitconverterultimate/models/Unit.kt @@ -144,10 +144,13 @@ sealed class Pressure(override val displayStringResId: Int) : Unit() { object TechnicalAtmosphere : Pressure(R.string.technical_atmosphere) object MmHg : Pressure(R.string.mmhg) object Torr : Pressure(R.string.torr) + object MmH2O : Pressure(R.string.mmh2o) + object InHg : Pressure(R.string.inhg) + object InH2O : Pressure(R.string.inh2o) companion object { val all: List = listOf( - Megapascal, Kilopascal, Pascal, Bar, Psi, Psf, Atmosphere, TechnicalAtmosphere, MmHg, Torr + Megapascal, Kilopascal, Pascal, Bar, Psi, Psf, Atmosphere, TechnicalAtmosphere, MmHg, Torr, MmH2O, InHg, InH2O ) } } From 68e3b58fb330672060f2e138115c27bed76f138b Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:50:44 +0000 Subject: [PATCH 05/20] Updated to add water and mercury column units --- .../android/unitconverterultimate/data/DataSource.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/v6000/src/main/java/com/physphil/android/unitconverterultimate/data/DataSource.kt b/v6000/src/main/java/com/physphil/android/unitconverterultimate/data/DataSource.kt index e446119..689648b 100644 --- a/v6000/src/main/java/com/physphil/android/unitconverterultimate/data/DataSource.kt +++ b/v6000/src/main/java/com/physphil/android/unitconverterultimate/data/DataSource.kt @@ -145,7 +145,10 @@ object PressureDataSource : DataSource() { Pressure.Atmosphere to multipliers("101325", "0.0000098692326671601283"), Pressure.TechnicalAtmosphere to multipliers("98066.5", "0.0000101971621297792824257"), Pressure.MmHg to multipliers("133.322387415", "0.007500615758456563339513"), - Pressure.Torr to multipliers("133.3223684210526315789", "0.00750061682704169751") + Pressure.Torr to multipliers("133.3223684210526315789", "0.00750061682704169751"), + Pressure.MmH2O to multipliers("9.806650", "0.1019716"), + Pressure.InHg to multipliers("3386.388640341", "0.00029529983"), + Pressure.InH2O to multipliers("249.0889", "0.0040146309") ) } From ec906f89652c0206a56fa0db2d1c375ef5335c3e Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:52:19 +0000 Subject: [PATCH 06/20] Updated to add water and mercury column units --- v6000/src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/v6000/src/main/res/values/strings.xml b/v6000/src/main/res/values/strings.xml index 397b872..800b270 100644 --- a/v6000/src/main/res/values/strings.xml +++ b/v6000/src/main/res/values/strings.xml @@ -168,6 +168,9 @@ Technical Atm mm Hg Torr + mm H2O + in Hg + in H2O Kilometre/hour From 2f4c45d9c01c1aa539a4cd0f024784be8f6554dc Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:55:19 +0000 Subject: [PATCH 07/20] Updated to add water and mercury column units --- app/src/main/res/values/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ed7142..1cf9d29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -196,6 +196,9 @@ Technical Atm mm Hg Torr + mm H2O + in Hg + in H2O Kilometre/hour @@ -291,4 +294,4 @@ Icelandic Krona Norwegian - \ No newline at end of file + From ae08fd3bce2ba0588ebcef3548415eb1604fbf17 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:57:10 +0000 Subject: [PATCH 08/20] Updated to add water and mercury column units --- app/src/main/res/values-de/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6a7f9ba..aafbe7c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -180,6 +180,9 @@ Technische Atm. mm Hg Torr + mm H2O + in Hg + in H2O Kilometer/Stunde From 94ad3571a1e1f1f0a26da00daf38f24afdd8f903 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:58:08 +0000 Subject: [PATCH 09/20] Updated to add water and mercury column units --- app/src/main/res/values-es/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index b33fe64..8f70062 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -180,6 +180,9 @@ Atm Técnica mm Hg Torr + mm H2O + in Hg + in H2O Kilometro/hora From b968e55402d49c84d48f4f05dee7251713f305c4 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 22:59:40 +0000 Subject: [PATCH 10/20] Updated to add water and mercury column units - need help with translation and file formatting (Right Justified) - Attempted with other units as sample --- app/src/main/res/values-fa/strings.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 63b2921..fa59042 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -180,7 +180,10 @@ Technical Atm میلی متر جیوه Torr - + میلی متر H2O + اینچ Hg + اینچ H2O + کیلومتر/ساعت مایل/ساعت @@ -267,4 +270,4 @@ دلار آمریکا رند آفریقای جنوبی - \ No newline at end of file + From 81b02df2822c5c5ff84bbd63aebc337d4a982b88 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:00:44 +0000 Subject: [PATCH 11/20] Updated to add water and mercury column units --- app/src/main/res/values-fr/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 01dd1a1..91f13a0 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -181,6 +181,9 @@ Atm. technique mmHg Torr + mmH2O + inHg + inH2O Kilomètre/heure From 87d67edb6af5a5d0e16cc5a84ce0c97c42ba1b60 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:02:23 +0000 Subject: [PATCH 12/20] Updated to add water and mercury column units --- app/src/main/res/values-hr/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 2a51a65..4ecb364 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -180,6 +180,9 @@ Technical Atm mm Hg Torr + mm H2O + in Hg + in H2O Kilometar/sat From 1f906c42e2b28df4075d5040092603ede12db1a1 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:03:51 +0000 Subject: [PATCH 13/20] Updated to add water and mercury column units Needs translation assistance - Attempted with other units as sample --- app/src/main/res/values-hu/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 15e617d..79fda64 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -183,6 +183,9 @@ Technikai atmoszféra mmHg Torr + mmH2O + Hüvelyk Hg + Hüvelyk H2O Kilométer/óra From a4617c66fac48509ddaf744d2d0ce2738c53e105 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:05:02 +0000 Subject: [PATCH 14/20] Updated to add water and mercury column units --- app/src/main/res/values-it/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e1bd1c9..82c0680 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -180,6 +180,9 @@ Atmosfera Tecnica mm Hg Torr + mm H2O + in Hg + in H2O Km/h @@ -267,4 +270,4 @@ Dollaro Americano Rand Sudafricano - \ No newline at end of file + From 3dabbdcc5bd87193a67586e4efa576fc3af35b89 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:06:12 +0000 Subject: [PATCH 15/20] Updated to add water and mercury column units --- app/src/main/res/values-ja/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 22bc0ea..371d994 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -180,6 +180,9 @@ 工学気圧 mm Hg トル + mm H2O + in Hg + in H2O キロメートル/時 @@ -267,4 +270,4 @@ 米ドル 南アフリカ・ランド - \ No newline at end of file + From e9a9538ae09b47d201fbefb5bf65c00cfb3fda2c Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:07:05 +0000 Subject: [PATCH 16/20] Updated to add water and mercury column units --- app/src/main/res/values-nb/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 9843055..d05658b 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -183,6 +183,9 @@ Teknisk Atm mm Hg Torr + mm H2O + in Hg + in H2O Kilometer/time From 823773684f8614a3d0af3f41bfcc646d44e398df Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:08:45 +0000 Subject: [PATCH 17/20] Updated to add water and mercury column units --- app/src/main/res/values-nl/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index d6428db..0015ac9 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -197,6 +197,9 @@ Technical Atm mm Hg Torr + mm H2O + in Hg + in H2O Kilometer/uur @@ -284,4 +287,4 @@ Amerikaanse Dollar Zuid-Afrikaanse Rand - \ No newline at end of file + From 81c0199f29f9bd31bd7cf909fe834283f1f807bf Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:09:29 +0000 Subject: [PATCH 18/20] Updated to add water and mercury column units --- app/src/main/res/values-pt-rBR/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 136d7b9..b872771 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -179,6 +179,9 @@ Atmosfera técnica mm Hg Torr + mm H2O + in Hg + in H2O Quilômetro/hora @@ -269,4 +272,4 @@ Escolha o idioma a ser usado em todo o aplicativo Idioma - \ No newline at end of file + From ed2173dd2f62d2b1646084cbc5e9d7894478cab0 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:10:50 +0000 Subject: [PATCH 19/20] Updated to add water and mercury column units need translation assistance - Attempted with other units as sample --- app/src/main/res/values-ru/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 977d1f2..0d08203 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -180,6 +180,9 @@ Технич. атмосфера мм рт. ст. Торр + мм H2O + Дюйм рт. ст. + Дюйм H2O Километр/час @@ -267,4 +270,4 @@ Доллар США Южноафриканский рэнд - \ No newline at end of file + From 0d1cd6379bee50af1763f7d62a3bd2c541063fe6 Mon Sep 17 00:00:00 2001 From: ProperBrgdbald <64764903+ProperBrgdbald@users.noreply.github.com> Date: Mon, 7 Aug 2023 23:12:06 +0000 Subject: [PATCH 20/20] Updated to add water and mercury column units --- app/src/main/res/values-tr/strings.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 365d50d..9790342 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -180,6 +180,9 @@ Teknik Atmosfer mm Hg Torr + mm H2O + in Hg + in H2O Kilometre/saat @@ -267,4 +270,4 @@ Amerikan Doları Güney Afrika Randı - \ No newline at end of file +