Merge pull request #608 from mahajanmahesh935/content

TASK : #0000 Credit Popup Showing more values check conditions
NIUANULP · Sep 13, 2024 · 0cc3fa7 · 0cc3fa7
2 parents 9940f8d + 0a90e17
commit 0cc3fa7
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 18 deletions.
diff --git a/packages/nulp_elite/public/locales/be/translation.json b/packages/nulp_elite/public/locales/be/translation.json
@@ -296,5 +296,8 @@
   "ADMIN":"অ্যাডমিন",
   "LEARNING_REPORT":"লার্নিং রিপোর্ট",
   "POPULAR_COURSES" : "জনপ্রিয় কোর্স",
-  "RECENTLY_ADDED":"সম্প্রতি যোগ করা হয়েছে"
+  "RECENTLY_ADDED":"সম্প্রতি যোগ করা হয়েছে",
+  "This content is derived from": "এই বিষয়বস্তু থেকে সংগৃহীত",
+  "LICENSE TERMS": "লাইসেন্সের শর্তাবলী",
+  "PUBLISHED ON NULP BY": "NULP দ্বারা প্রকাশিত"
 }
diff --git a/packages/nulp_elite/public/locales/en/translation.json b/packages/nulp_elite/public/locales/en/translation.json
@@ -316,6 +316,8 @@
   "ADMIN":"Admin",
   "LEARNING_REPORT":"Learning Report",
   "POPULAR_COURSES" : "Popular Courses",
-  "RECENTLY_ADDED":"Recently Added"
-
+  "RECENTLY_ADDED":"Recently Added",
+  "This content is derived from": "This content is derived from",
+  "LICENSE TERMS": "LICENSE TERMS",
+  "PUBLISHED ON NULP BY": "PUBLISHED ON NULP BY"
 }
diff --git a/packages/nulp_elite/public/locales/gg/translation.json b/packages/nulp_elite/public/locales/gg/translation.json
@@ -306,7 +306,9 @@
   "ADMIN":"એડમિન",
   "LEARNING_REPORT":"લર્નિંગ રિપોર્ટ",
   "POPULAR_COURSES" : "લોકપ્રિય અભ્યાસક્રમો",
-  "RECENTLY_ADDED":"તાજેતરમાં ઉમેરાયેલ"
-
+  "RECENTLY_ADDED":"તાજેતરમાં ઉમેરાયેલ",
+  "This content is derived from": "આ સામગ્રીમાંથી ઉત્પન્ન છે",
+  "LICENSE TERMS": "લાઇસન્સની શરતો",
+  "PUBLISHED ON NULP BY": "NULP દ્વારા પ્રકાશિત"
 
 }
diff --git a/packages/nulp_elite/public/locales/hi/translation.json b/packages/nulp_elite/public/locales/hi/translation.json
@@ -298,5 +298,8 @@
   "ADMIN":"व्यवस्थापक",
   "LEARNING_REPORT":"सीखने की रिपोर्ट",
   "POPULAR_COURSES" : "लोकप्रिय पाठ्यक्रम",
-  "RECENTLY_ADDED":"हाल ही में जोड़ा"
+  "RECENTLY_ADDED":"हाल ही में जोड़ा",
+  "This content is derived from": "यह सामग्री से व्युत्पन्न है",
+  "LICENSE TERMS": "लाइसेंस की शर्तें",
+  "PUBLISHED ON NULP BY": "एनयूपीएलपी द्वारा प्रकाशित"
 }
diff --git a/packages/nulp_elite/public/locales/ma/translation.json b/packages/nulp_elite/public/locales/ma/translation.json
@@ -298,6 +298,9 @@
   "ADMIN":"प्रशासक",
   "LEARNING_REPORT":"शिकण्याचा अहवाल",
   "POPULAR_COURSES" : "लोकप्रिय अभ्यासक्रम",
-  "RECENTLY_ADDED":"अलीकडे जोडले"
+  "RECENTLY_ADDED":"अलीकडे जोडले",
+  "This content is derived from": "ही सामग्री यावरून घेतली आहे",
+  "LICENSE TERMS": "परवाना अटी",
+  "PUBLISHED ON NULP BY": "एनयूपीएलपीद्वारे प्रकाशित"
 
 }
diff --git a/packages/nulp_elite/public/locales/mal/translation.json b/packages/nulp_elite/public/locales/mal/translation.json
@@ -298,5 +298,8 @@
   "ADMIN":"അഡ്മിൻ",
   "LEARNING_REPORT":"പഠന റിപ്പോർട്ട്",
   "POPULAR_COURSES" : "ജനപ്രിയ കോഴ്സുകൾ",
-  "RECENTLY_ADDED":"അടുത്തിടെ ചേർത്തത് "
+  "RECENTLY_ADDED":"അടുത്തിടെ ചേർത്തത് ",
+  "This content is derived from": "ഈ ഉള്ളടക്കം നിന്നു പ്രാപ്തമായതാണ്",
+  "LICENSE TERMS": "ലൈസൻസ് നിബന്ധനകൾ",
+  "PUBLISHED ON NULP BY": "NULP വഴി പ്രസിദ്ധീകരിച്ചത്"
 }
diff --git a/packages/nulp_elite/public/locales/ta/translation.json b/packages/nulp_elite/public/locales/ta/translation.json
@@ -323,5 +323,8 @@
   "ADMIN":"நிர்வாகி",
   "LEARNING_REPORT":"கற்றல் அறிக்கை",
   "POPULAR_COURSES" : " జనాదరణ పొందిన కోర్సులు",
-  "RECENTLY_ADDED":"ఇటీవల జోడించబడింది"
+  "RECENTLY_ADDED":"ఇటీవల జోడించబడింది",
+  "This content is derived from": "இந்த உள்ளடக்கம் இதிலிருந்து பெறப்பட்டுள்ளது",
+  "LICENSE TERMS": "உரிமம் நிபந்தனைகள்",
+  "PUBLISHED ON NULP BY": "NULP மூலம் வெளியிடப்பட்டது"
 }
diff --git a/packages/nulp_elite/public/locales/te/translation.json b/packages/nulp_elite/public/locales/te/translation.json
@@ -261,5 +261,8 @@
   "ADMIN":"నిర్వాహకుడు",
   "LEARNING_REPORT":"లెర్నింగ్ రిపోర్ట్",
   "POPULAR_COURSES" : "జనాదరణ పొందిన కోర్సులు",
-  "RECENTLY_ADDED":"ఇటీవల జోడించబడింది"
+  "RECENTLY_ADDED":"ఇటీవల జోడించబడింది",
+  "This content is derived from": "ఈ సాంఘికత నుండి పొందినది",
+  "LICENSE TERMS": "లైసెన్స్ నిబంధనలు",
+  "PUBLISHED ON NULP BY": "NULP ద్వారా ప్రచురించబడింది"
 }
diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -1442,25 +1442,29 @@ className="xs-hide accordionBoxShadow"
                     <DialogTitle>{t("CREDITS")}</DialogTitle>
                    <DialogContent>
                     <p style={{ color: "#4d4d4d", fontSize: "13px", fontWeight: "bold" }}>
-                        COPYRIGHT
+                        {t("COPYRIGHT")}
                       </p>
                       {userData?.result?.content?.orgDetails?.orgName && userData?.result?.content?.copyrightYear
                         ? `${userData.result.content.orgDetails.orgName}, ${userData.result.content.copyrightYear}`
                         : userData?.result?.content?.orgDetails?.orgName || userData?.result?.content?.copyrightYear
                       }
-                      <h5>This content is derived from</h5>
+                      {userData?.result?.content?.originData && (
+                        <>
+                        <h5>{t("This content is derived from")}</h5>
                       <p style={{ color: "#4d4d4d", fontSize: "13px", fontWeight: "bold" }}>
-                        CONTENT
+                        {t("CONTENT")}
                       </p>
-                      {userData?.result?.content?.name}
+                      {userData?.result?.content?.originData?.name}
                      <p style={{ color: "#4d4d4d", fontSize: "13px", fontWeight: "bold" }}>
-                        LICENSE TERMS
+                        {t("LICENSE TERMS")}
                       </p>
-                      {userData?.result?.content?.licenseDetails?.name}
+                      {userData?.result?.content?.originData?.license}
                       <p style={{ color: "#4d4d4d", fontSize: "13px", fontWeight: "bold" }}>
-                        PUBLISHED ON NULP BY
+                        {t("PUBLISHED ON NULP BY")}
                       </p>
-                      {userData?.result?.content?.orgDetails?.orgName}
+                      {userData?.result?.content?.originData?.organisation[0]}
+                        </>
+                      )}
                     </DialogContent>
                     <DialogActions>
                       <Button onClick={handleClose} color="primary">