Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

copy improvements on data export

This commit is contained in:
Jeff Atwood 2014-12-24 15:41:21 -08:00
parent 26129e95dc
commit 3b945920d4
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/desktop/user.scss
View File

@ -139,11 +139,6 @@
} }
} }
.user-archive {
margin-top: 10px;
margin-bottom: 10px;
}
.user-right.groups { .user-right.groups {
margin-top: 0; margin-top: 0;
} }

6
config/locales/client.en.yml
View File

@ -292,7 +292,7 @@ en:
profile: "Profile" profile: "Profile"
mute: "Mute" mute: "Mute"
edit: "Edit Preferences" edit: "Edit Preferences"
download_archive: "Download archive of my posts" download_archive: "Download My Posts"
new_private_message: "New Private Message" new_private_message: "New Private Message"
private_message: "Private Message" private_message: "Private Message"
private_messages: "Messages" private_messages: "Messages"
@ -494,7 +494,7 @@ en:
none: "You haven't invited anyone here yet. You can send individual invites, or invite a bunch of people at once by <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>uploading a bulk invite file</a>." none: "You haven't invited anyone here yet. You can send individual invites, or invite a bunch of people at once by <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>uploading a bulk invite file</a>."
text: "Bulk Invite from File" text: "Bulk Invite from File"
uploading: "Uploading..." uploading: "Uploading..."
success: "File uploaded successfully, you will be notified shortly with progress." success: "File uploaded successfully, you will be notified via private message when the process is complete."
error: "There was an error uploading '{{filename}}': {{message}}" error: "There was an error uploading '{{filename}}': {{message}}"
password: password:
@ -1695,7 +1695,7 @@ en:
confirm: "Are your sure you want to rollback the database to the previous working state?" confirm: "Are your sure you want to rollback the database to the previous working state?"
export_csv: export_csv:
success: "Export initiated, you will be notified shortly with progress." success: "Export initiated, you will be notified via private message when the process is complete."
failed: "Export failed. Please check the logs." failed: "Export failed. Please check the logs."
button_text: "Export" button_text: "Export"
button_title: button_title:

12
config/locales/server.en.yml
View File

@ -1481,17 +1481,17 @@ en:
``` ```
csv_export_succeeded: csv_export_succeeded:
subject_template: "Data Export completed successfully" subject_template: "Data export complete"
text_body_template: | text_body_template: |
The data export was successful. Your data export was successful! :dvd:
Download CSV file: <a class="attachment" href="%{download_link}">%{file_name}</a> <a class="attachment" href="%{download_link}">%{file_name}</a>
<small>CSV file download link will expire after 48 hours.</small> The above download link will be valid for 48 hours.
csv_export_failed: csv_export_failed:
subject_template: "Export failed" subject_template: "Data export failed"
text_body_template: "The export has failed. Please check the logs." text_body_template: "We're sorry, but your data export failed. Please check the logs or contact a staff member."
email_reject_trust_level: email_reject_trust_level:
subject_template: "Email issue -- Insufficient Trust Level" subject_template: "Email issue -- Insufficient Trust Level"