style: million & billion to Million & Billion

globalfund · Nov 11, 2024 · 4fb957f · 4fb957f
1 parent b20476d
commit 4fb957f
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 22 deletions.
diff --git a/cypress/e2e/homepage.cy.ts b/cypress/e2e/homepage.cy.ts
@@ -35,7 +35,7 @@ describe("Testing HomePage", () => {
       .first()
       .should(
         "have.text",
-        "The Global Fund invests US$5 billion a year to defeat HIV, tuberculosis and malaria and ensure a healthier, safer, equitable future for all."
+        "The Global Fund invests US$5 Billion a year to defeat HIV, tuberculosis and malaria and ensure a healthier, safer, equitable future for all."
       );
   });
 

diff --git a/src/app/components/chart-block/components/button-toolbar/data.tsx b/src/app/components/chart-block/components/button-toolbar/data.tsx
@@ -40,7 +40,7 @@ export const NOTES_BUDGETS =
   "Grant budgets are published from the 2017-2019 grant cycle and have been annualized for each grant implementation period.<br /><br />The RSSH category correspond to financial amounts for stand-alone RSSH grants and is not reflective of the full RSSH investment.";
 
 export const NOTES_PLEDGES_CONTRIBUTIONS =
-  "Where pledges have been made that are not specific to individual years, the amount shown as pledged for a period is the sum of contributions received in that period.<br/>The donor withholds a portion of its funding to use for technical assistance related to the Global Fund.<br/><br/> · Australia: 2014-2016, 2017-2019, 2020-2022, 2023-2025 <br />· Ecobank: 2014-2016, 2017-2019 <br />· France: 2011-2013, 2014-2016, 2017-2019, 2020-2022, 2023-2025 <br />· Germany: 2017-2019 <br />· Italy: 2017-2019, 2020-2022 <br />· Luxembourg: 2020-2022 <br />· Netherlands: 2014-2016, 2017-2019 <br />· Other Public: 2020-2022              <br />· United Kingdom: 2020-2022 <br />· United States: 2001-2005, 2006-2007, 2008-2010, 2011-2013, 2014-2016, 2017-2019, 2020-2022 , 2023-2025    <br />· Bill & Melinda Gates Foundation: 2023-2025        <br /> <br /> Contribution includes a EUR 5,5 million contribution from Gen. Catalunya in 2005-2008. <br />· Spain: 2001-2005, 2006-2007, 2008-2010 <br /> <br /> In addition to its contribution, the donor funded JPY 75 million in technical assistance related to the Global Fund for 2010-2019. <br />· Takeda Pharmaceutical: 2008-2010, 2011-2013, 2014-2016, 2017-2019 <br /> <br /> The U.S. contribution to the Global Fund is subject to legislative restrictions, including that, during 2004-2026, no U.S. government contribution may cause the total share of U.S. government funds contributed to exceed 33 percent of total cumulative contributions from all sources. <br /> · United States: 2001-2005, 2006-2007, 2008-2010, 2011-2013, 2014-2016, 2017-2019, 2020-2022, 2023-2025              <br /> <br /> A portion of this pledge, EUR 100 million, is reserved for debt cancellations under Debt2Health. · Germany: 2017-2019, 2023-2025              <br /> <br /> The donor withholds a portion of its funding to use for in-kind contributions related to the Global Fund. <br /> · Goodbye Malaria: 2017-2019, 2020-2022, 2023-2025 <br /> <br /> In addition to its contribution, the donor funds JPY 36 million in technical assistance related to the Global Fund for 2020-2022. <br /> · Takeda Pharmaceutical: 2020-2022";
+  "Where pledges have been made that are not specific to individual years, the amount shown as pledged for a period is the sum of contributions received in that period.<br/>The donor withholds a portion of its funding to use for technical assistance related to the Global Fund.<br/><br/> · Australia: 2014-2016, 2017-2019, 2020-2022, 2023-2025 <br />· Ecobank: 2014-2016, 2017-2019 <br />· France: 2011-2013, 2014-2016, 2017-2019, 2020-2022, 2023-2025 <br />· Germany: 2017-2019 <br />· Italy: 2017-2019, 2020-2022 <br />· Luxembourg: 2020-2022 <br />· Netherlands: 2014-2016, 2017-2019 <br />· Other Public: 2020-2022              <br />· United Kingdom: 2020-2022 <br />· United States: 2001-2005, 2006-2007, 2008-2010, 2011-2013, 2014-2016, 2017-2019, 2020-2022 , 2023-2025    <br />· Bill & Melinda Gates Foundation: 2023-2025        <br /> <br /> Contribution includes a EUR 5,5 Million contribution from Gen. Catalunya in 2005-2008. <br />· Spain: 2001-2005, 2006-2007, 2008-2010 <br /> <br /> In addition to its contribution, the donor funded JPY 75 Million in technical assistance related to the Global Fund for 2010-2019. <br />· Takeda Pharmaceutical: 2008-2010, 2011-2013, 2014-2016, 2017-2019 <br /> <br /> The U.S. contribution to the Global Fund is subject to legislative restrictions, including that, during 2004-2026, no U.S. government contribution may cause the total share of U.S. government funds contributed to exceed 33 percent of total cumulative contributions from all sources. <br /> · United States: 2001-2005, 2006-2007, 2008-2010, 2011-2013, 2014-2016, 2017-2019, 2020-2022, 2023-2025 <br /> <br /> A portion of this pledge, EUR 100 Million, is reserved for debt cancellations under Debt2Health. · Germany: 2017-2019, 2023-2025              <br /> <br /> The donor withholds a portion of its funding to use for in-kind contributions related to the Global Fund. <br /> · Goodbye Malaria: 2017-2019, 2020-2022, 2023-2025 <br /> <br /> In addition to its contribution, the donor funds JPY 36 Million in technical assistance related to the Global Fund for 2020-2022. <br /> · Takeda Pharmaceutical: 2020-2022";
 
 export const NOTES_FINANCIALS =
   "The geographical designations employed by the Global Fund do not represent or imply any opinion or judgment on the legal status of any country, territory, city or area on its governmental or state authorities, or on the delimitation of its frontiers or boundaries.<br/><br/>Financial amounts in currencies other than USD from 2014 onward were converted to USD using fixed Replenishment exchange rate, also referred to as the Reference Rate. Financial amounts before 2014 were converted using spot exchange rates.<br /><br />The RSSH category correspond to financial amounts for stand-alone RSSH grants and is not reflective of the full RSSH investment.";

diff --git a/src/app/components/filters/list/data.tsx b/src/app/components/filters/list/data.tsx
@@ -1,6 +1,6 @@
-import { AppliedFiltersModel } from "app/state/api/action-reducers/sync/filters";
 import { appColors } from "app/theme";
 import styled from "styled-components";
+import { AppliedFiltersModel } from "app/state/api/action-reducers/sync/filters";
 
 export interface FilterModel {
   name: string;

diff --git a/src/app/components/search/components/results/index.tsx b/src/app/components/search/components/results/index.tsx
@@ -48,7 +48,6 @@ export function SearchResults(props: SearchResultsProps) {
       )}
       <Results>
         {props.results.map((result: SearchResultModel) => {
-          console.log(result, "result");
           if (!result.link) {
             return (
               <ResultA

diff --git a/src/app/pages/datasets/access-to-funding/data.tsx b/src/app/pages/datasets/access-to-funding/data.tsx
@@ -17,15 +17,15 @@ export const stats: {
   value: number | string;
 }[] = [
   {
-    value: "24.5 million",
+    value: "24.5 Million",
     label: "People on antiretroviral therapy for HIV in 2022.",
   },
   {
-    value: "6.7 million",
+    value: "6.7 Million",
     label: "People with TB treated in 2022.",
   },
   {
-    value: "220 million",
+    value: "220 Million",
     label: "Mosquito nets distributed in 2022.",
   },
 ];

diff --git a/src/app/pages/datasets/annual-results/data.ts b/src/app/pages/datasets/annual-results/data.ts
@@ -12,15 +12,15 @@ export const stats: {
   value: number | string;
 }[] = [
   {
-    value: "24.5 million",
+    value: "24.5 Million",
     label: "People on antiretroviral therapy for HIV in 2022.",
   },
   {
-    value: "6.7 million",
+    value: "6.7 Million",
     label: "People with TB treated in 2022.",
   },
   {
-    value: "220 million",
+    value: "220 Million",
     label: "Mosquito nets distributed in 2022.",
   },
 ];

diff --git a/src/app/pages/datasets/grant-implementation/data.tsx b/src/app/pages/datasets/grant-implementation/data.tsx
@@ -22,15 +22,15 @@ export const stats: {
   value: number | string;
 }[] = [
   {
-    value: "24.5 million",
+    value: "24.5 Million",
     label: "People on antiretroviral therapy for HIV in 2022.",
   },
   {
-    value: "6.7 million",
+    value: "6.7 Million",
     label: "People with TB treated in 2022.",
   },
   {
-    value: "220 million",
+    value: "220 Million",
     label: "Mosquito nets distributed in 2022.",
   },
 ];

diff --git a/src/app/pages/home/components/hero/index.tsx b/src/app/pages/home/components/hero/index.tsx
@@ -26,7 +26,7 @@ export const HomeHero: React.FC = () => {
         {getCMSDataField(
           cmsData,
           "pagesHome.subtitle",
-          "The Global Fund invests US$5 billion a year to defeat HIV, tuberculosis and malaria and ensure a healthier, safer, equitable future for all."
+          "The Global Fund invests US$5 Billion a year to defeat HIV, tuberculosis and malaria and ensure a healthier, safer, equitable future for all."
         )}
       </Typography>
     </React.Fragment>

diff --git a/src/app/utils/applyResultValueFormula.ts b/src/app/utils/applyResultValueFormula.ts
@@ -14,7 +14,7 @@ function fnum(x: number) {
   if (x < 1000000) {
     return {
       number: evenRound(x / 1000000, 2),
-      text: "million",
+      text: "Million",
     };
   }
   // if (x < 10000000) {
@@ -24,31 +24,31 @@ function fnum(x: number) {
   //       : (x / 1000000).toFixed(2);
   //   return {
   //     number: Number(n),
-  //     text: 'million'
+  //     text: 'Million'
   //   };
   // }
   if (x < 10000000) {
     return {
       number: evenRound(x / 1000000, 2),
-      text: "million",
+      text: "Million",
     };
   }
   if (x < 100000000) {
     return {
       number: evenRound(x / 1000000, 2),
-      text: "million",
+      text: "Million",
     };
   }
   if (x < 1000000000) {
     return {
       number: Math.round(x / 1000000),
-      text: "million",
+      text: "Million",
     };
   }
   if (x < 1000000000000) {
     return {
       number: Math.round(x / 1000000000),
-      text: "billion",
+      text: "Billion",
     };
   }
   return {

diff --git a/src/app/utils/getFinancialValueWithMetricPrefix.ts b/src/app/utils/getFinancialValueWithMetricPrefix.ts
@@ -5,13 +5,13 @@ const ranges = [
     divider: 1e9,
     suffix: "Bn",
     abbr_en: " bln",
-    full: "billion",
+    full: "Billion",
   },
   {
     divider: 1e6,
     suffix: "MM",
     abbr_en: " mln",
-    full: "million",
+    full: "Million",
   },
   {
     divider: 1e3,