Merge pull request #75 from CIAT-DAPA/develop

EWP-274 missing translations implemented
CIAT-DAPA · Jun 21, 2024 · 2216350 · 2216350
2 parents 9102e30 + 5ef1ae2
commit 2216350
Show file tree

Hide file tree

Showing 6 changed files with 104 additions and 93 deletions.
diff --git a/src/src/components/sliderYear/SliderYear.js b/src/src/components/sliderYear/SliderYear.js
@@ -42,7 +42,7 @@ function SliderYear({ step, min, max, value, onChange }) {
 
       <Row >
         <Col className="col-4 col-lg-3">
-          <label className="mb-1 d-flex aling-items-center" htmlFor="min"><IconCalendarTime stroke={1} className="me-2" />Start:</label>
+          <label className="mb-1 d-flex aling-items-center" htmlFor="min"><IconCalendarTime stroke={1} className="me-2" />{t("data.slider-start")}</label>
           <Form.Select size="lg" id="min" value={minValue} onChange={handleMinChange}>
             {Array.from({ length: max - min + 1 }, (_, i) => (
               <option key={max - i} value={max - i}>{max - i}</option>
@@ -51,7 +51,7 @@ function SliderYear({ step, min, max, value, onChange }) {
         </Col>
         <Col className="col-2 col-lg-2 d-flex flex-column fs-2 justify-content-end text-center w-auto">-</Col>
         <Col className="col-4 col-lg-3">
-          <label className="mb-1 d-flex aling-items-center" htmlFor="max"><IconCalendarTime stroke={1} className="me-2" />End:</label>
+          <label className="mb-1 d-flex aling-items-center" htmlFor="max"><IconCalendarTime stroke={1} className="me-2" />{t("data.slider-end")}</label>
           <Form.Select size="lg" id="max" value={maxValue} onChange={handleMaxChange} >
             {Array.from({ length: max - min + 1 }, (_, i) => (
               <option key={min + i} value={min + i} >{min + i} </option>

diff --git a/src/src/pages/dashboard/Dashboard.js b/src/src/pages/dashboard/Dashboard.js
@@ -353,7 +353,7 @@ function HistoricalData() {
                         {t("data.depth-description")}{" "}
                         <span className="fw-bold ">{wp.name}</span>,{" "}
                         {t("data.depth-year")} {t("data.between")}{" "}
-                        <span className="fw-bold ">{value.min}</span> and{" "}
+                        <span className="fw-bold ">{value.min}</span> {t("data.and")}{" "}
                         <span className="fw-bold ">{value.max}</span>.
                       </p>
                       <ReactApexChart
@@ -405,7 +405,7 @@ function HistoricalData() {
                           {t("data.scaled-description")}{" "}
                           <span className="fw-bold ">{wp.name}</span>,{" "}
                           {t("data.depth-year")} {t("data.between")}{" "}
-                          <span className="fw-bold ">{value.min}</span> and{" "}
+                          <span className="fw-bold ">{value.min}</span> {t("data.and")}{" "}
                           <span className="fw-bold ">{value.max}</span>.
                         </p>
                         <ReactApexChart
@@ -450,7 +450,7 @@ function HistoricalData() {
                         {t("data.rain-description")}{" "}
                         <span className="fw-bold ">{wp.name}</span>,{" "}
                         {t("data.depth-year")} {t("data.between")}{" "}
-                        <span className="fw-bold ">{value.min}</span> and{" "}
+                        <span className="fw-bold ">{value.min}</span> {t("data.and")}{" "}
                         <span className="fw-bold ">{value.max}</span>.
                       </p>
                       <ReactApexChart
@@ -530,7 +530,7 @@ function HistoricalData() {
                         {t("data.evap-description")}{" "}
                         <span className="fw-bold ">{wp.name}</span>,{" "}
                         {t("data.depth-year")} {t("data.between")}{" "}
-                        <span className="fw-bold ">{value.min}</span> and{" "}
+                        <span className="fw-bold ">{value.min}</span> {t("data.and")}{" "}
                         <span className="fw-bold ">{value.max}</span>.
                       </p>
                       <ReactApexChart

diff --git a/src/src/pages/userprofile/Userprofile.js b/src/src/pages/userprofile/Userprofile.js
@@ -298,7 +298,9 @@ function Userprofile() {
                           <></>
                         )}
                         <h5 className="fw-medium text-capitalize ">
-                          {boletin.boletin}
+                          {boletin.boletin == "weekly"
+                            ? t("subscriptionButton.weekly")
+                            : t("subscriptionButton.alert")}
                         </h5>
                       </div>
 

diff --git a/src/src/translations/am/global.json b/src/src/translations/am/global.json
@@ -59,7 +59,7 @@
     "placeholder-search": "በውሃ ነጥብ፣ በወረዳ፣ በዞን ወይም በክልል ይፈልጉ",
     "modal-title": "ማስጠንቀቂያ",
     "modal-body": "የኩሬው መገለጫ በተመረጠው ቋንቋ አይገኝም, ውስጥ ብቻ ነው የሚገኘው",
-    "modal-close": "",
+    "modal-close": "ዝጋ/ዝጊ",
     "modal-continue": "ወደ ኩሬ መገለጫ ይቀጥሉ",
     "diff-location": "ከተለየ አካባቢ ይጀምሩ?",
     "walk": "መራመድ",
@@ -105,8 +105,8 @@
     "monitored": "ክትትል የተደረገበት ዳታ",
     "monitored-d": "የ የኩሬ ጥልቀት, ጥልቀት ስፋት, የውሃ እና የመጓጓዣ የሚሸፍን የተለያዩ ሰንጠረዦች ይቃኙ. እነዚህን ግራፎች በመረጥከው ዓመት መሠረት በማጣራት ተሞክሮህን ማስተካከል ትችላለህ። የመስክ ጥልቀት, ጥልቀት ስፋት, የውሃ እና evapo፟transpiration የሚሸፍን የተለያዩ ሰንጠረዦች ይቃኙ. እነዚህን ግራፎች በመረጥከው ዓመት መሠረት በማጣራት ተሞክሮህን ማስተካከል ትችላለህ።",
     "year": "አመት",
-    "depth_daily_average": "",
-    "scaled_depth_daily_average": "",
+    "depth_daily_average": "የሞዴል የባለፉት ረጅም ቀናት አማካይ የውሃ ጥልቀት",
+    "scaled_depth_daily_average": "የሞዴል የባለፉት ረጅም ቀናት አማካይ የውሃ ንፅፅራዊ ጥልቀት",
     "depth": "ጥልቀት",
     "depth-description": "እነዚህ ግራፎች የውሃ ነጥብ ጥልቀትና ወቅታዊ የአየር ሁኔታን መረጃ ያሳያል",
     "depth-year": "በዓመቱ ውስጥ",
@@ -132,40 +132,43 @@
     "upper-label": "ላይ",
     "seasonal": "ወቅታዊ ትንበያ",
     "seasonal-d": "የአየር ንብረት ትንበያ የሚሰጠው የአንድ አካባቢ እና የአንድ የተወሰነ ወር መደበኛ የዝናብ መጠንን በተመለከተ በመቶኛ የመሆን እድል  ነው። ከዚህ በታች ለተመረጠው ወረዳ እና የትንበያ ወር በጣም ሊከሰት የሚችል ምድብ ማግኘት ይችላሉ",
-    "notFound-title": "",
+    "notFound-title": "የ 'Aclimate' መለያ አልገባም",
     "notFound-d": "መረጃዉን ከውሃ ነጥቦች ማሳያ ገፅ ለማግኘት ይሞክሩ።",
     "climate": "የአየር ንብረት ትንበያ",
     "climatology": "የአየር ንብረት",
-    "climatology-monthly": "",
+    "climatology-monthly": "ያለፉት ወራት አማካይ",
     "loading": "ውንግል መረጃ አገናኝ",
     "min-year": "ዝቅተኛ-ዓመት",
     "max-year": "ከፍተኛ-ዓመት",
     "between": "መካከል",
     "source": "ምንጭ",
     "download": "የተመረጠውን ውሂብ አውርድ",
-    "no-forecast": ""
+    "no-forecast": "በአሁኑ ጊዜ ምንም መረጃ የለም",
+    "slider-start": "ጀምር፡",
+    "slider-end": "መጨረሻ፡",
+    "and": "እና"
   },
   "notFound": {
     "title": "ውይ! ያልታወቀ ክልል ውስጥ የገባህ ይመስላል።",
     "description": "የሚፈልጉት ገጽ በእኛ ዲጂታል ካርታ ላይ ሊገኝ አልቻለም።"
   },
   "aboutUs": {
-    "title": "About Us",
-    "description-1": "Ethiopian Institute of Agricultural Research is one of the oldest and largest agricultural research institutes in Africa. EIAR was established in 1966 by Proclamation. It was then called Institute of Agricultural Research (IAR). In 1997 was renamed as Ethiopian Agricultural Research Organization (EARO). At the moment the institute is named as Ethiopian Institute Agricultural Research (EIAR). EIAR has 23 research centers located in various agro-ecologies of the country . These research centers are endowed with research setups that make them conducive and preferable for research endeavors. The headquarter of EIAR is located in the capital Addis Ababa. ",
-    "description-2": "EIAR made tremendous efforts to build the national capacity of doing agricultural research, produce, and introduce improved technologies focusing on fostering agricultural growth and development in the country. As a result, over the last four decades, the release of improved technologies in crop, livestock, soils and water, forestry and agricultural mechanization have increased dramatically. To date, the contribution of improved agricultural technologies generated and introduced by EIAR has become fundamental in the national economy.",
-    "description-3": "EIAR is doing its level best to introduce and generate agricultural technologies while also contributing to meet the national demands of transforming Ethiopian agriculture.",
-    "vision": "Vision",
-    "vision-d": "EIAR inspires to see improved livelihood of all Ethiopians engaged in agriculture, agro-pastoralism, and pastoralism through market competitive agricultural technologies",
-    "mission": "Mission",
-    "mission-d": "EIAR has a mission to conduct research that will provide market competitive agricultural technologies that will contribute to increased agricultural productivity and nutrition quality, sustainable food security, economic development, and conservation of the integrity of natural resources and the environment.",
-    "core-values": "Core Values",
-    "core-values-d": "EIAR sustains the commitments included in the following set of core values:",
-    "core-values-1": "Excellence",
-    "core-values-2": "Effectiveness",
-    "core-values-3": "Quality",
-    "core-values-4": "Integrity and professionalism",
-    "core-values-5": "Tolerance and mutual respect",
-    "core-values-6": "Social responsibility and public services"
+    "title": "ስለ እኛ መረጃ",
+    "description-1": "የኢትዮጵያ ግብርና ምርምር ኢንስቲትዩት ከአፍሪካ አንጋፋ እና ትልቁ ተቋም ነው። ተቋሙ በ1966 ዓ.ም በኢትዮጵያ መንግስት አዋጅ የተቋቋመ ሲሆን በወቅቱ የግብርና ምርምር ኢንስቲትዩት ይባል ነበር። በ1967 ዓ.ም ስያሜው ወደ ኢትዮጵያ ግብርና ምርምር ተቋም ተቀየረ። በአሁኑ ጊዜ የኢትዮጵያ ግብርና ምርምር ኢንስቲትዩት ይባላል። ኢንስቲትዩቱ በአሁኑ ወቅት በተለያዩ የሀገሪቱ ክፍሎች በሃያ ሶስት (23) የግብርና ምርምር ማዕከላት አማካኝነት እየሰራ ይገኛል። ሁሉም የምርምር ማዕከላት የተገነቡት ለጥናትና ምርምር ስራ አመች እና ተስማሚ በሆነ መልኩ ነው። የተቋሙ ዋና መሥሪያ ቤት በሀገሪቱ ዋና ከተማ አዲስ አበባ ውስጥ ይገኛል።",
+    "description-2": "የኢትዮጵያ ግብርና ምርምር ኢንስቲትዩት በአገር አቀፍ ደረጃ የግብርና ምርምር አቅምን ለመገንባት፣ ግብርናውን የሚያሳድጉና አገራዊ ልማትን የሚያጠናክሩ የተሻሻሉ ቴክኖሎጂዎችን ለመፍጠር ከፍተኛ ጥረት አድርጓል። በዚህም ባለፉት አርባ (40) ዓመታት የተሻሻሉ ቴክኖሎጂዎች ለሰብል፣ ለእንሰሳት፣ ለአፈርና ውሀ፣ ለደን ልማትና ለግብርና ማሻሻያ የሚሆኑ ቴክኖሎጂዎች ተዘጋጅተው ለህብረተሰቡ ቀርበዋል። በአሁኑ ወቅት በኢትዮጵያ ግብርና ምርምር ኢንስቲትዩት የተሻሻሉ ቴክኖሎጂዎች ሚና በአገር ኢኮኖሚ ውስጥ ወሳኝ እየሆኑ መጥተዋል።",
+    "description-3": "የኢትዮጵያ ግብርና ምርምር ኢንስቲትዩት የተሻሻሉ የግብርና ቴክኖሎጅዎችን በመፍጠር እና ለተጠቃሚዎች በማስተዋወቅ ረገድ የተቻለውን ሁሉ እያደረገ ሲሆን የኢትዮጵያን ግብርና ለመለወጥ አገራዊ ፍላጎቶችን ለማሟላት የበኩሉን አስተዋጽኦ እያበረከተ ነው። ",
+    "vision": "ራዕይ",
+    "vision-d": "የኢትዮጵያ ግብርና ምርምር ኢንስቲትዩት በግብርና፣ በግብርና እና አርብቶ አደርነት ፣ እንዲሁም  በአርብቶ አደርነት የተሰማሩ ኢትዮጵያውያንን ሁሉ የተሻሻለ የግብርና ዉጤት እና የገበያ ተወዳዳሪ ሆኖ ማየት ይፈልጋል::",
+    "mission": "ተልዕኮ",
+    "mission-d": "የኢትዮጵያ ግብርና ምርምር ኢንስቲትዩት ለግብርና ምርታማነት እና ለሥነ-ምግብ ጥራት፣ ለዘላቂ የምግብ ዋስትና፣ ለኢኮኖሚ ልማት እና ለተፈጥሮ ሀብትና ለአካባቢ ጥበቃ አስተዋጽኦ የሚያበረክቱ የገበያ ተወዳዳሪ የግብርና ቴክኖሎጂዎችን የሚሰጡ ምርምሮችን የማካሄድ ተልዕኮ አለው።",
+    "core-values": "ዋና እሴቶች",
+    "core-values-d": "የኢትዮጵያ ግብርና ምርምር ኢንስቲትዩት ከዚህ በታች የተዘረዘሩትን ዋና እሴቶቹን አጠናክሮ ይጠብቃል:",
+    "core-values-1": "ልህቀት",
+    "core-values-2": "ውጤታማነት",
+    "core-values-3": "ጥራት",
+    "core-values-4": "ታማኝነት እና ሙያዊ ሥነ-ምግባር",
+    "core-values-5": "መቻቻል እና መከባበር",
+    "core-values-6": "ማህበራዊ ሃላፊነት እና የህዝብ አገልግሎቶች"
   },
   "subscriptionButton": {
     "weekly": "በየሳምንቱ",
@@ -174,14 +177,14 @@
     "unsubscribe": "አባልነት ያቋርጡ"
   },
   "subscriptionToast": {
-    "subscribed": "",
-    "unsubscribed": ""
+    "subscribed": "ስኬታማ ነህ! አሁን በዚህ ሀይቅ የውሃ ይዘት ላይ መረጃ ለመቀበል ተመዝግበዋል።",
+    "unsubscribed": " ዋው፣ ከሀይቁ የውሃ ይዘት መረጃ ምዝገባ ወጥተሃል!"
   },
   "forage": {
-    "show-woredas": "",
-    "show": "",
+    "show-woredas": "ወረዳዎችን አሳይ",
+    "show": "የውሃ ተፋሰስ አሳይ",
     "loading": "የግጦሽ መረጃ",
-    "biomass": ""
+    "biomass": "ባዮማስ"
   },
   "privacy": {
     "title": "ግላዊነት",
@@ -199,20 +202,20 @@
     "description-3-7": "ይህንን ስምምነት በመፈረም/በመቀበል፣የዚህን ጥናት አላማ እንደተነገረዎት እና ከላይ በተጠቀሰው መሰረት እንደተስማሙ እና በዚህ ጥናት ላይ ለመሳተፍ ፍቃድዎን ሰጥተዋል።"
   },
   "user-profile": {
-    "edit": "",
-    "subscription": "",
-    "save": "",
-    "loading": "",
-    "title": "",
-    "description-1": "",
-    "description-2-1": "",
-    "description-2-2": "",
-    "description-2-3": "",
-    "edit-2": "",
-    "no-subscription": "At the moment you dont have subscriptions",
-    "no-subscription-sub-1": "try going to the",
-    "no-subscription-sub-2": "waterpoint display",
-    "no-subscription-sub-3": "and subscribing to a waterpoint"
+    "edit": "የእርስዎን ያርትዑ",
+    "subscription": "የአባልነት ምዝገባ",
+    "save": "ለውጦችን አስቀምጥ",
+    "loading": "ስለእርስዎ መረጃ ለማግኘት",
+    "title": "የተመዘገቡ ሀይቆች",
+    "description-1": "ወደ ሀይቅ የደንበኝነት ምዝገባ አስተዳደር ክፍል እንኳን በደህና መጡ።",
+    "description-2-1": "በጣም ወቅታዊ መረጃዎችን እና ማንኛውም ተዛማጅ ዝመናዎችን እንዲያውቁት እናደርግዎታለን። መረጃ ለማግኘት ለመመዝገብ ከታች ካሉት ሁለት ዓይነት የደንበኝነት ምዝገባዎች መካከል መምረጥ ይችላሉ፡:",
+    "description-2-2": "በየሳምንቱ መረጃን በመደበኛነት የሚቀበሉበት, ወይም",
+    "description-2-3": "በሀይቁ ሁኔታ ላይ ስላሉ ጉልህ ለውጦች መረጃን ወዲያውኑ ስለለማሳወቅ",
+    "edit-2": "የደንበኝነት ምዝገባን ይቀይሩ",
+    "no-subscription": "በአሁኑ ጊዜ የውሃ ይዘትን ለማግኘት የሚያስችል አባልነት የለዎትም",
+    "no-subscription-sub-1": "ወደ ------ለመሄድ ይሞክሩ",
+    "no-subscription-sub-2": "የሐይቁ ይዘት ማሳያ",
+    "no-subscription-sub-3": "እና ለሐይቁ የውሃ ይዘት መረጃ ምዝገባ"
   },
   "advisories": {
     "title": "ጠቃሚ ምክሮች",
@@ -226,7 +229,7 @@
     "alert": "ማንቂያ",
     "near-dry": "ሊደረቅ ያለ",
     "seasonal-dry": "በወቅቱ -የደረቅ",
-    "messages-d": "Advisory for each condition of the water point",
+    "messages-d": "የውሃ ነጥብ ለእያንዳንዱ ሁኔታ ምክር",
     "message": "የምክር መልእክት",
     "good-message": "ሀይቁ በጥሩ ሁኔታ ላይ ነው እና የውሃ ፍጆታን ለሌሎች ዓላማዎች መቆጠብ ይመከራል",
     "watch-message": "ሐይቁ ትኩረት የሚሻ ሁኔታ ላይ ነው እና ለሌላ ዓላማዎች የኩሬ ውሃ ፍጆታን ይቀንሱ እና የኩሬውን አስተዳዳሪ መመሪያዎችን ይከተሉ",

diff --git a/src/src/translations/en/global.json b/src/src/translations/en/global.json
@@ -143,7 +143,10 @@
     "between": "Between",
     "source": "Source",
     "download": "Download Selected Data",
-    "no-forecast": "At the moment there is no data available"
+    "no-forecast": "At the moment there is no data available",
+    "slider-start": "Start:",
+    "slider-end": "End:",
+    "and": "and"
   },
   "notFound": {
     "title": "Oops! Looks like you've ventured into uncharted territory.",
@@ -155,7 +158,7 @@
     "description-2": "EIAR made tremendous efforts to build the national capacity of doing agricultural research, produce, and introduce improved technologies focusing on fostering agricultural growth and development in the country. As a result, over the last four decades, the release of improved technologies in crop, livestock, soils and water, forestry and agricultural mechanization have increased dramatically. To date, the contribution of improved agricultural technologies generated and introduced by EIAR has become fundamental in the national economy.",
     "description-3": "EIAR is doing its level best to introduce and generate agricultural technologies while also contributing to meet the national demands of transforming Ethiopian agriculture.",
     "vision": "Vision",
-    "vision-d": "EIAR inspires to see improved livelihood of all Ethiopians engaged in agriculture, agro-pastoralism, and pastoralism through market competitive agricultural technologies",
+    "vision-d": "EIAR aspires to see improved livelihood of all Ethiopians engaged in agriculture, agro-pastoralism, and pastoralism through market competitive agricultural technologies",
     "mission": "Mission",
     "mission-d": "EIAR has a mission to conduct research that will provide market competitive agricultural technologies that will contribute to increased agricultural productivity and nutrition quality, sustainable food security, economic development, and conservation of the integrity of natural resources and the environment.",
     "core-values": "Core Values",