toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add localization support to the android downloader (#1175)

Browse source
This commit is contained in:
enahum 2017-11-21 09:45:32 -03:00 committed by GitHub
parent bc1554e1bd
commit d1318d4631
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/screens/image_preview/downloader.android.js
View file

@ -11,6 +11,7 @@ import {
View
} from 'react-native';
import RNFetchBlob from 'react-native-fetch-blob';
import {intlShape} from 'react-intl';
import {Client4} from 'mattermost-redux/client';
@ -37,18 +38,29 @@ export default class Downloader extends PureComponent {
show: false
};
static contextTypes = {
intl: intlShape
};
checkForPermissions = async () => {
const canWriteToStorage = await PermissionsAndroid.check(EXTERNAL_STORAGE_PERMISSION);
if (!canWriteToStorage) {
const permissionRequest = await PermissionsAndroid.request(EXTERNAL_STORAGE_PERMISSION, 'We need access to the downloads folder to save files.');
const {intl} = this.context;
const description = intl.formatMessage({
id: 'mobile.downloader.android_permission',
defaultMessage: 'We need access to the downloads folder to save files.'
});
const permissionRequest = await PermissionsAndroid.request(EXTERNAL_STORAGE_PERMISSION, description);
return permissionRequest === 'granted';
}
return true;
}
};
handleDownload = async () => {
const {file, onDownloadCancel, onDownloadStart, onDownloadSuccess} = this.props;
const {intl} = this.context;
const canWriteToStorage = await this.checkForPermissions();
if (!canWriteToStorage) {
@ -57,7 +69,20 @@ export default class Downloader extends PureComponent {
}
try {
ToastAndroid.show('Download started', ToastAndroid.SHORT);
const started = intl.formatMessage({
id: 'mobile.downloader.android_started',
defaultMessage: 'Download started'
});
const title = intl.formatMessage({
id: 'mobile.downloader.android_success',
defaultMessage: 'download successful'
});
const complete = intl.formatMessage({
id: 'mobile.downloader.android_complete',
defaultMessage: 'Download complete'
});
ToastAndroid.show(started, ToastAndroid.SHORT);
onDownloadStart();
const imageUrl = Client4.getFileUrl(file.id);
@ -68,7 +93,7 @@ export default class Downloader extends PureComponent {
useDownloadManager: true,
notification: true,
path: `${RNFetchBlob.fs.dirs.DownloadDir}/${file.name}`,
title: `${file.name} download successful`,
title: `${file.name} ${title}`,
mime: file.mime_type,
description: file.name,
mediaScannable: true
@ -79,13 +104,18 @@ export default class Downloader extends PureComponent {
await task;
ToastAndroid.show('Download complete', ToastAndroid.SHORT);
ToastAndroid.show(complete, ToastAndroid.SHORT);
onDownloadSuccess();
} catch (error) {
ToastAndroid.show('Download failed', ToastAndroid.SHORT);
const failed = intl.formatMessage({
id: 'mobile.downloader.android_failed',
defaultMessage: 'Download failed'
});
ToastAndroid.show(failed, ToastAndroid.SHORT);
onDownloadCancel();
}
}
};
render() {
const {show} = this.props;

4
assets/base/i18n/en.json
View file

@ -1943,6 +1943,10 @@
"mobile.custom_list.no_results": "No Results",
"mobile.document_preview.failed_title": "Open Document failed",
"mobile.document_preview.failed_description": "An error occurred while opening the document. Please make sure you have a {fileType} viewer installed and try again.\n",
"mobile.downloader.android_complete": "Download complete",
"mobile.downloader.android_failed": "Download failed",
"mobile.downloader.android_success": "download successful",
"mobile.downloader.android_started": "Download started",
"mobile.downloader.complete": "Download complete",
"mobile.downloader.downloading": "Downloading...",
"mobile.downloader.failed_description": "An error occurred while downloading the file. Please check your internet connection and try again.\n",