Skip to content

Commit

Permalink
Merge branch 'PalisadoesFoundation:develop' into dashboardItems
Browse files Browse the repository at this point in the history
  • Loading branch information
skbhagat0502 authored Nov 5, 2023
2 parents d30ef22 + 5696ed8 commit f01e37b
Show file tree
Hide file tree
Showing 53 changed files with 5,292 additions and 1,804 deletions.
88 changes: 55 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"react-dom": "^17.0.2",
"react-google-recaptcha": "^2.1.0",
"react-i18next": "^11.18.1",
"react-infinite-scroll-component": "^6.1.0",
"react-redux": "^7.2.5",
"react-router-dom": "^5.2.0",
"react-scripts": "5.0.1",
Expand Down
42 changes: 35 additions & 7 deletions public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"cancel": "Cancel",
"noOrgErrorTitle": "Organizations Not Found",
"noOrgErrorDescription": "Please create an organization through dashboard",

"endOfResults": "End of results",
"manageFeatures": "Manage Features",
"manageFeaturesInfo": "Creation Successful ! Please select features that you want to enale for this organization from the plugin store.",
"goToStore": "Go to Plugin Store",
Expand All @@ -109,6 +109,15 @@
"name": "Name",
"email": "Email",
"roles_userType": "Role/User-Type",
"joined_organizations": "Joined Organizations",
"blocked_organizations": "Blocked Organizations",
"orgJoinedBy": "Organizations Joined By",
"orgThatBlocked": "Organizations That Blocked",
"endOfResults": "End of results",
"hasNotJoinedAnyOrg": "has not joined any organization",
"isNotBlockedByAnyOrg": "is not blocked by any organization",
"searchByOrgName": "Search By Organization Name",
"view": "View",
"admin": "ADMIN",
"superAdmin": "SUPERADMIN",
"user": "USER",
Expand All @@ -131,6 +140,7 @@
"accept": "Accept",
"reject": "Reject",
"enterName": "Enter Name",
"endOfResults": "End of results",
"loadingRequests": "Loading Requests...",
"noRequestFound": "No Request Found",
"sort": "Sort",
Expand All @@ -153,6 +163,13 @@
"events": "Events",
"blockedUsers": "Blocked Users",
"requests": "Requests",
"viewAll": "View All",
"upcomingEvents": "Upcoming Events",
"noUpcomingEvents": "No Upcoming Events",
"latestPosts": "Latest Posts",
"noPostsPresent": "No Posts Present",
"membershipRequests": "Membership requests",
"noMembershipRequests": "No Membership requests present",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
},
"organizationPeople": {
Expand Down Expand Up @@ -251,17 +268,25 @@
"posts": "Posts",
"createPost": "Create Post",
"postDetails": "Post Details",
"postTitle1": "Write title of the post",
"postTitle": "Title",
"information": "Information",
"information1": "Write information of the post",
"image": "Post Image",
"video": "Video",
"video": "Post Video",
"addPost": "Add Post",
"searchTitle": "Search By Title",
"searchText": "Search By Text",
"ptitle": "Post Title",
"postDes": "What do you to talk about?",
"Title": "Title",
"Text": "Text"
"Text": "Text",
"cancel": "Cancel",
"searchBy": "Search By",
"Oldest": "Oldest First",
"Latest": "Latest First",
"sortPost": "Sort Post",
"tag": " Your browser does not support the video tag"
},
"postNotFound": {
"post": "Post",
Expand All @@ -283,6 +308,7 @@
"author": "Author",
"imageURL": "Image URL",
"videoURL": "Video URL",
"edit": "Edit Post",
"deletePost": "Delete Post",
"deletePostMsg": "Do you want to remove this post?",
"no": "No",
Expand All @@ -296,6 +322,8 @@
"updatePost": "Update Post",
"postDeleted": "Post deleted successfully.",
"postUpdated": "Post Updated successfully.",
"tag": " Your browser does not support the video tag",
"pin": "Pin Post",
"talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
},
"blockUnblockUser": {
Expand Down Expand Up @@ -328,7 +356,7 @@
"enterNewPassword": "Enter New Password",
"cofirmNewPassword": "Confirm New Password",
"changePassword": "Change Password",
"backToHome": "Back to Home",
"backToLogin": "Back to Login",
"userOtp": "e.g. 12345",
"password": "Password",
"emailNotRegistered": "Email is not registered.",
Expand Down Expand Up @@ -377,9 +405,9 @@
"deleteOrg": {
"deleteOrganization": "Delete Organization",
"deleteMsg": "Do you want to delete this organization?",
"no": "No",
"yes": "Yes",
"longDelOrgMsg": "By clicking on Delete organization button you will the organization will be permanently deleted along with its events, tags and all related data."
"cancel": "Cancel",
"confirmDelete": "Confirm Delete",
"longDelOrgMsg": "By clicking on Delete Organization button the organization will be permanently deleted along with its events, tags and all related data."
},
"userUpdate": {
"firstName": "First Name",
Expand Down
Loading

0 comments on commit f01e37b

Please sign in to comment.