Просмотр исходного кода

Merge pull request #4299 from overleaf/msm-reword-dropbox-error-modal

Reworded Dropbox message for projects with duplicate names

GitOrigin-RevId: b9fe6f6ca98308dd502243c49a4bdfc136f02cdf
Shane Kilkelly 5 лет назад
Родитель
Сommit
295fd61317
2 измененных файлов с 9 добавлено и 4 удалено
  1. 7 3
      services/web/app/views/project/list/notifications.pug
  2. 2 1
      services/web/locales/en.json

+ 7 - 3
services/web/app/views/project/list/notifications.pug

@@ -108,9 +108,13 @@ include ../../_mixins/reconfirm_affiliation
 					ng-switch-when="notification_dropbox_duplicate_project_names"
 					ng-switch-when="notification_dropbox_duplicate_project_names"
 				)
 				)
 					.notification-body
 					.notification-body
-						| !{translate("dropbox_duplicate_project_names", {projectName: '{{notification.messageOpts.projectName}}'}, ['strong'])}
-						|  
-						a(href="/learn/how-to/Dropbox_Synchronization#Troubleshooting") #{translate("learn_more")}
+						p()
+							| !{translate("dropbox_duplicate_project_names", { projectName: '{{notification.messageOpts.projectName}}'}, ['strong'])}
+						p()
+							| !{translate("dropbox_duplicate_project_names_suggestion", {}, ['strong'])}
+							|  
+							a(href="/learn/how-to/Dropbox_Synchronization#Troubleshooting") #{translate("learn_more")}
+							|.
 					.notification-close
 					.notification-close
 						button.btn-sm(ng-click="dismiss(notification)").close.pull-right
 						button.btn-sm(ng-click="dismiss(notification)").close.pull-right
 							span(aria-hidden="true") ×
 							span(aria-hidden="true") ×

+ 2 - 1
services/web/locales/en.json

@@ -1396,7 +1396,8 @@
   "please_change_primary_to_remove": "Please change your primary email in order to remove",
   "please_change_primary_to_remove": "Please change your primary email in order to remove",
   "please_reconfirm_your_affiliation_before_making_this_primary": "Please confirm your affiliation before making this the primary.",
   "please_reconfirm_your_affiliation_before_making_this_primary": "Please confirm your affiliation before making this the primary.",
   "please_link_before_making_primary": "Please confirm your email by linking to your institutional account before making it the primary email.",
   "please_link_before_making_primary": "Please confirm your email by linking to your institutional account before making it the primary email.",
-  "dropbox_duplicate_project_names": "We detected an update from Dropbox to <0>__projectName__</0>, but you have multiple projects with that name. We are unable to process this, so have unlinked your Dropbox account. Please ensure your project names are unique across your active, archived and trashed projects, and then re-link your Dropbox account.",
+  "dropbox_duplicate_project_names": "Your Dropbox account has been unlinked, because you have more than one project called <0>\"__projectName__\"</0>.",
+  "dropbox_duplicate_project_names_suggestion": "Please make your project names unique across all your <0>active, archived and trashed</0> projects and then re-link your Dropbox account.",
   "please_reconfirm_institutional_email": "Please take a moment to confirm your institutional email address or <0>remove it</0> from your account.",
   "please_reconfirm_institutional_email": "Please take a moment to confirm your institutional email address or <0>remove it</0> from your account.",
   "need_to_add_new_primary_before_remove": "You'll need to add a new primary email address before you can remove this one.",
   "need_to_add_new_primary_before_remove": "You'll need to add a new primary email address before you can remove this one.",
   "are_you_still_at": "Are you still at <0>__institutionName__</0>?",
   "are_you_still_at": "Are you still at <0>__institutionName__</0>?",