fixing conflicts
This commit is contained in:
parent
69055a504b
commit
6670d9ad69
|
@ -87,7 +87,11 @@ $(document).ready(function() {
|
|||
$('#cancel-upload').click(() => {
|
||||
fileSender.cancel();
|
||||
location.reload();
|
||||
notify('Your upload was cancelled.');
|
||||
document.l10n.formatValue('uploadCancelNotification')
|
||||
.then(str => {
|
||||
console.log('here')
|
||||
notify(str);
|
||||
})
|
||||
});
|
||||
|
||||
fileSender.on('progress', progress => {
|
||||
|
@ -212,10 +216,10 @@ $(document).ready(function() {
|
|||
const row = document.createElement('tr');
|
||||
const name = document.createElement('td');
|
||||
const link = document.createElement('td');
|
||||
const $copyIcon = $('<img>', { src: '/resources/copy-16.svg', class: 'icon-copy', title: 'Copy URL' });
|
||||
const $copyIcon = $('<img>', { src: '/resources/copy-16.svg', class: 'icon-copy', 'data-l10n-id': 'copyUrlHover'});
|
||||
const expiry = document.createElement('td');
|
||||
const del = document.createElement('td');
|
||||
const $delIcon = $('<img>', { src: '/resources/close-16.svg', class: 'icon-delete', title: 'Delete' });
|
||||
const $delIcon = $('<img>', { src: '/resources/close-16.svg', class: 'icon-delete', 'data-l10n-id': 'deleteButtonHover' });
|
||||
const popupDiv = document.createElement('div');
|
||||
const $popupText = $('<div>', { class: 'popuptext' });
|
||||
const cellText = document.createTextNode(file.name);
|
||||
|
|
|
@ -18,6 +18,7 @@ notifyUploadDone = Your upload has finished.
|
|||
uploadingPageMessage = Once your file uploads you will be able to set expiry options.
|
||||
uploadingPageCancel = Cancel upload
|
||||
.title = {uploadingPageCancel}
|
||||
uploadCancelNotification = Your upload was cancelled.
|
||||
|
||||
uploadingPageLargeFileMessage = This file is large and may take awhile to upload. Sit tight!
|
||||
uploadingFileNotification = Notify me when the upload is complete.
|
||||
|
|
|
@ -66,8 +66,8 @@ app.use(busboy());
|
|||
app.use(bodyParser.json());
|
||||
app.use(express.static(STATIC_PATH));
|
||||
app.use('/l20n', express.static(L20N));
|
||||
app.use('/download/*/l20n', express.static(L20N));
|
||||
app.use('/download/*/locales', express.static(LOCALES));
|
||||
// app.use('/download/*/l20n', express.static(L20N));
|
||||
app.use('/locales', express.static(LOCALES));
|
||||
|
||||
app.get('/', (req, res) => {
|
||||
res.render('index', {
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
<meta name="defaultLanguage" content="en-US">
|
||||
<meta name="availableLanguages" content="en-US">
|
||||
<link rel="localization" href="locales/send.{locale}.ftl">
|
||||
<link rel="localization" href="/locales/send.{locale}.ftl">
|
||||
<script defer src="/l20n/dist/web/l20n.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
|
|
Loading…
Reference in New Issue