Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jetpack Settings: Add notices for (de)activating Jetpack modules #10583

Merged
merged 4 commits into from
Feb 2, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions client/state/notices/jetpack-modules/constants.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/**
* External dependencies
*/
import { translate } from 'i18n-calypso';

/**
* Internal dependencies
*/
import {
JETPACK_MODULE_ACTIVATE_FAILURE as ACTIVATE_FAILURE,
JETPACK_MODULE_ACTIVATE_SUCCESS as ACTIVATE_SUCCESS,
JETPACK_MODULE_DEACTIVATE_FAILURE as DEACTIVATE_FAILURE,
JETPACK_MODULE_DEACTIVATE_SUCCESS as DEACTIVATE_SUCCESS,
} from 'state/action-types';

export const MODULE_NOTICES = {
'infinite-scroll': {
[ ACTIVATE_SUCCESS ]: translate( 'Infinite scroll is now on.' ),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternate string suggestion:

  • translate( 'Scroll Infinitely' )— translations: 25. ES Score: 4.27

PR translation status page

[ DEACTIVATE_SUCCESS ]: translate( 'Infinite scroll is now off.' ),
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternate string suggestion:

  • translate( 'Scroll Infinitely' )— translations: 25. ES Score: 4.14

PR translation status page

[ ACTIVATE_FAILURE ]: translate( 'Infinite scroll could not be switched on.' ),
[ DEACTIVATE_FAILURE ]: translate( 'Infinite scroll could not be switched off.' ),
},
};
51 changes: 51 additions & 0 deletions client/state/notices/jetpack-modules/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/**
* External dependencies
*/
import { translate } from 'i18n-calypso';

/**
* Internal dependencies
*/
import {
JETPACK_MODULE_ACTIVATE_FAILURE,
JETPACK_MODULE_ACTIVATE_SUCCESS,
JETPACK_MODULE_DEACTIVATE_FAILURE,
JETPACK_MODULE_DEACTIVATE_SUCCESS,
} from 'state/action-types';
import { MODULE_NOTICES } from './constants';
import { successNotice, errorNotice } from 'state/notices/actions';

export const onJetpackModuleActivationActionMessage = ( dispatch, { type, moduleSlug } ) => {
const noticeSettings = { duration: 10000 };
let message = MODULE_NOTICES[ moduleSlug ] && MODULE_NOTICES[ moduleSlug ][ type ];
let messageType;

switch ( type ) {
case JETPACK_MODULE_ACTIVATE_SUCCESS:
message = message || translate( 'Turned on successfully.' );
messageType = 'success';
break;
case JETPACK_MODULE_DEACTIVATE_SUCCESS:
message = message || translate( 'Turned off successfully.' );
messageType = 'success';
break;
case JETPACK_MODULE_ACTIVATE_FAILURE:
message = message || translate( 'An error occurred during activation.' );
messageType = 'error';
break;
case JETPACK_MODULE_DEACTIVATE_FAILURE:
message = message || translate( 'An error occurred during deactivation.' );
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternate string suggestion:

  • translate( 'An error occurred while deactivating %(plugin)s on %(site)s.' )— translations: 39. ES Score: 4.59

PR translation status page

messageType = 'error';
break;
}

if ( ! message ) {
return;
}

if ( messageType === 'success' ) {
dispatch( successNotice( message, noticeSettings ) );
} else if ( messageType === 'error' ) {
dispatch( errorNotice( message, noticeSettings ) );
}
};
9 changes: 9 additions & 0 deletions client/state/notices/middleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ import {
GRAVATAR_UPLOAD_REQUEST_FAILURE,
GRAVATAR_UPLOAD_REQUEST_SUCCESS,
GUIDED_TRANSFER_HOST_DETAILS_SAVE_SUCCESS,
JETPACK_MODULE_ACTIVATE_SUCCESS,
JETPACK_MODULE_DEACTIVATE_SUCCESS,
JETPACK_MODULE_ACTIVATE_FAILURE,
JETPACK_MODULE_DEACTIVATE_FAILURE,
KEYRING_CONNECTION_DELETE,
POST_DELETE_FAILURE,
POST_DELETE_SUCCESS,
Expand Down Expand Up @@ -56,6 +60,7 @@ import {
onAccountRecoveryPhoneValidationSuccess,
onAccountRecoveryPhoneValidationFailed,
} from './account-recovery';
import { onJetpackModuleActivationActionMessage } from './jetpack-modules';

/**
* Handlers
Expand Down Expand Up @@ -190,6 +195,10 @@ export const handlers = {
},
[ GRAVATAR_UPLOAD_REQUEST_FAILURE ]: dispatchError( translate( 'New Gravatar was not saved.' ) ),
[ GRAVATAR_UPLOAD_REQUEST_SUCCESS ]: dispatchSuccess( translate( 'New Gravatar uploaded successfully!' ) ),
[ JETPACK_MODULE_ACTIVATE_SUCCESS ]: onJetpackModuleActivationActionMessage,
[ JETPACK_MODULE_DEACTIVATE_SUCCESS ]: onJetpackModuleActivationActionMessage,
[ JETPACK_MODULE_ACTIVATE_FAILURE ]: onJetpackModuleActivationActionMessage,
[ JETPACK_MODULE_DEACTIVATE_FAILURE ]: onJetpackModuleActivationActionMessage,
[ KEYRING_CONNECTION_DELETE ]: onPublicizeConnectionDelete,
[ POST_DELETE_FAILURE ]: onPostDeleteFailure,
[ POST_DELETE_SUCCESS ]: dispatchSuccess( translate( 'Post successfully deleted' ) ),
Expand Down