diff --git ecard/ecard.info ecard/ecard.info
index b895af3..407fdc1 100644
--- ecard/ecard.info
+++ ecard/ecard.info
@@ -1,5 +1,5 @@
-name = E-Card
-description = "Leave an E-Card for your frieds on the site."
+name = Ecard
+description = "Leave an ecard for your friends on the site."
core = 7.x
dependencies[] = entity
diff --git ecard/ecard.install ecard/ecard.install
index fb42e26..c6c59c1 100644
--- ecard/ecard.install
+++ ecard/ecard.install
@@ -10,7 +10,7 @@
*/
function ecard_schema() {
$schema['ecard'] = array(
- 'description' => 'The table for E-Cards.',
+ 'description' => 'The table for ecards.',
'fields' => array(
'hash' => array(
'description' => 'The hash-value unique identifier.',
@@ -20,7 +20,7 @@ function ecard_schema() {
'default' => '',
),
'entity_type' => array(
- 'description' => 'The entity type of the parent entity the E-Card is saved in.',
+ 'description' => 'The entity type of the parent entity the ecard is saved in.',
'type' => 'varchar',
'length' => 32,
'not null' => TRUE,
@@ -34,14 +34,14 @@ function ecard_schema() {
'default' => '',
),
'entity_id' => array(
- 'description' => 'The entity:bundle:id of the parent entity the E-Card is saved in.',
+ 'description' => 'The entity:bundle:id of the parent entity the ecard is saved in.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'uid' => array(
- 'description' => 'The user id of the author of the E-Card.',
+ 'description' => 'The user id of the author of the ecard.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -62,14 +62,14 @@ function ecard_schema() {
'default' => '',
),
'mail_to' => array(
- 'description' => 'The e-mail address of the reciever.',
+ 'description' => 'The e-mail address of the recipient.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
'default' => '',
),
'name_to' => array(
- 'description' => 'The name of the reciever.',
+ 'description' => 'The name of the recipient.',
'type' => 'varchar',
'length' => 255,
'not null' => TRUE,
@@ -111,21 +111,21 @@ function ecard_schema() {
function ecard_field_schema($field) {
$columns = array(
'id' => array(
- 'description' => 'CSS ID for the E-Card div.',
+ 'description' => 'CSS ID for the ecard div.',
'type' => 'varchar',
'not null' => TRUE,
'length' => 255,
'default' => '',
),
'class' => array(
- 'description' => 'CSS class for the E-Card div.',
+ 'description' => 'CSS class for the ecard div.',
'type' => 'varchar',
'not null' => TRUE,
'length' => 255,
'default' => '',
),
'top' => array(
- 'description' => 'Top offset of the E-Card text in pixel.',
+ 'description' => 'Top offset of the ecard text in pixel.',
'type' => 'int',
'size' => 'small',
'not null' => TRUE,
@@ -133,7 +133,7 @@ function ecard_field_schema($field) {
'unsigned' => TRUE,
),
'left' => array(
- 'description' => 'Left offset of the E-Card text in pixel.',
+ 'description' => 'Left offset of the ecard text in pixel.',
'type' => 'int',
'size' => 'small',
'not null' => TRUE,
@@ -141,7 +141,7 @@ function ecard_field_schema($field) {
'unsigned' => TRUE,
),
'width' => array(
- 'description' => 'Width of the E-Card text in pixel.',
+ 'description' => 'Width of the ecard text in pixel.',
'type' => 'int',
'size' => 'small',
'not null' => TRUE,
@@ -149,7 +149,7 @@ function ecard_field_schema($field) {
'unsigned' => TRUE,
),
'color' => array(
- 'description' => 'Color of the E-Card message to be displayed in hexadecimal.',
+ 'description' => 'Color of the ecard message to be displayed in hexadecimal.',
'type' => 'varchar',
'not null' => TRUE,
'length' => 6,
@@ -163,7 +163,7 @@ function ecard_field_schema($field) {
'default' => '',
),
'font_size' => array(
- 'description' => 'Font size of the E-Card text in pixel.',
+ 'description' => 'Font size of the ecard text in pixel.',
'type' => 'int',
'size' => 'small',
'not null' => TRUE,
@@ -186,4 +186,4 @@ function ecard_update_7001() {
'default' => 0,
);
db_change_field('ecard', 'pick_up', 'pick_up', $spec);
-}
\ No newline at end of file
+}
diff --git ecard/ecard.module ecard/ecard.module
index 5070408..da21862 100644
--- ecard/ecard.module
+++ ecard/ecard.module
@@ -2,7 +2,7 @@
/**
* @file
- * Main module file for the E-Card module.
+ * Main module file for the ecard module.
*/
module_load_include('inc', 'ecard', '/includes/ecard.entity');
module_load_include('inc', 'ecard', '/includes/ecard.field');
@@ -22,18 +22,18 @@ define('ECARD_IMAGE_FIELD', 8);
function ecard_permission() {
$perms = array(
'create ecard' => array(
- 'title' => t('Create E-Cards'),
- 'description' => t('Create E-Cards by using the E-Card field.'),
+ 'title' => t('Create ecards'),
+ 'description' => t('Create ecards by using the ecard field.'),
'restrict access' => TRUE,
),
'view ecard' => array(
- 'title' => t('View E-Cards'),
- 'description' => t('View the value of a created E-Card.'),
+ 'title' => t('View ecards'),
+ 'description' => t('View the value of a created ecard.'),
'restrict access' => TRUE,
),
'administer ecard' => array(
- 'title' => t('Administer E-Cards'),
- 'description' => t('Create, view, edit and delete E-Cards.'),
+ 'title' => t('Administer ecards'),
+ 'description' => t('Create, view, edit and delete ecards.'),
'restrict access' => TRUE,
),
);
@@ -52,12 +52,12 @@ function ecard_views_api() {
}
/**
- * Default text for the E-Card letter.
+ * Default text for the ecard letter.
*/
function _ecard_letter() {
$output = t("Hi [ecard:name_to],
-[ecard:name_from] made an E-Card for you.
+[ecard:name_from] made an ecard for you.
At any time you may see your card by clicking this link:
[ecard:ecard_url]
@@ -70,11 +70,11 @@ admin");
}
/**
- * Default text for the E-Card copy notice letter.
+ * Default text for the ecard copy notice letter.
*/
function _ecard_copy() {
$output = t("Hi [ecard:name_from],
-Here is the copy of your message you send to [ecard:name_to]
+Here is the copy of your message you sent to [ecard:name_to]
[ecard:ecard_url]
@@ -86,7 +86,7 @@ admin");
}
/**
- * Default text for the E-Card pickup notification.
+ * Default text for the ecard pickup notification.
*/
function _ecard_notice() {
$output = t("Hi,
diff --git ecard/includes/ecard.entity.inc ecard/includes/ecard.entity.inc
index eb27b1a..957854d 100644
--- ecard/includes/ecard.entity.inc
+++ ecard/includes/ecard.entity.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Provides entity integration for E-Card module
+ * Provides entity integration for ecard module
*/
/**
@@ -11,7 +11,7 @@
function ecard_entity_info() {
return array(
'ecard' => array(
- 'label' => t('E-Card'),
+ 'label' => t('Ecard'),
'entity class' => 'Entity',
'controller class' => 'EntityAPIController',
'base table' => 'ecard',
@@ -24,24 +24,24 @@ function ecard_entity_info() {
}
/**
- * Creates and saves an E-Card entity.
+ * Creates and saves an ecard entity.
*
* @param $ecard
- * An array of E-Card values.
+ * An array of ecard values.
* Necessary keys:
* nid: The node id refernce.
* mail_from: the mail of the sender.
* name_from: the name of the sender.
- * mail_to: the mail of the reciever.
- * name_to: the name of the reciever.
- * text: the content of the E-Card.
+ * mail_to: the mail of the recipient.
+ * name_to: the name of the recipient.
+ * text: the content of the ecard.
*
* Optional keys:
- * hash: the unique identifier of the E-Card. Pass for update.
+ * hash: the unique identifier of the ecard. Pass for update.
* pick_up: flag if the ecard alredy picked up. Default 0.
*
* @return
- * Returns the E-Card object if the entity was saved successfully.
+ * Returns the ecard object if the entity was saved successfully.
* Otherwise it returns FALSE.
*/
function ecard_create($ecard) {
@@ -62,7 +62,7 @@ function ecard_create($ecard) {
}
/**
- * Deletes an E-Card entity by given hash value.
+ * Deletes an ecard entity by given hash value.
*
* @param $hash
* The hash value of the etity to be deleted.
@@ -75,7 +75,7 @@ function ecard_delete($hash) {
}
/**
- * Deletes multiple E-Card entities by given hash values.
+ * Deletes multiple ecard entities by given hash values.
*
* @param array $hash
* An array of hash values of the etities to be deleted.
@@ -88,16 +88,16 @@ function ecard_delete_multiple(array $hashes) {
}
/**
- * Returns an E-Card entity by given hash value.
+ * Returns an ecard entity by given hash value.
*
* @param $hash
* The hash value of the entity to be returned.
- * Leave it NULL to recieve all E-Cards.
- * Pass a string to recive one E-Card.
- * Pass an array of hashes to recive X E-Cards.
+ * Leave it NULL to receive all ecards.
+ * Pass a string to receive one ecard.
+ * Pass an array of hashes to receive X ecards.
*
* @return
- * An arry with the called E-Card entitys.
+ * An array with the called ecard entities.
* Returns FALSE if there are no entities with the given hash value.
*/
function ecard_read($hash = FALSE) {
@@ -109,24 +109,24 @@ function ecard_read($hash = FALSE) {
}
/**
- * Updates an E-Card entity.
+ * Updates an ecard entity.
*
* @param $ecard
- * An array of E-Card values.
+ * An array of ecard values.
* Necessary keys:
- * hash: the unique identifier of the E-Card.
+ * hash: the unique identifier of the ecard.
*
* Optional keys:
* mail_from: the mail of the sender.
* nid: The node id refernce.
* name_from: the name of the sender.
- * mail_to: the mail of the reciever.
- * name_to: the name of the reciever.
- * text: the content of the E-Card.
+ * mail_to: the mail of the recipient.
+ * name_to: the name of the recipient.
+ * text: the content of the ecard.
* pick_up: flag if the ecard alredy picked up. Default 0.
*
* @return
- * Returns the E-Card object if the entity was saved successfully.
+ * Returns the ecard object if the entity was saved successfully.
* Otherwise it returns FALSE.
*/
function ecard_update($ecard) {
@@ -134,10 +134,10 @@ function ecard_update($ecard) {
}
/**
- * Helper function to check the hash value of an E-Card.
+ * Helper function to check the hash value of an ecard.
*
* @param $ecard
- * An array with the E-Card to check.
+ * An array with the ecard to check.
*
* @return
* FALSE if the hash value is not existing or with incorrect value.
@@ -154,13 +154,13 @@ function ecard_check_hash($ecard) {
}
/**
- * Render the given E-Card
+ * Render the given ecard
*
* @param $hash
- * The E-Card to render.
+ * The ecard to render.
*
* @return
- * The html of the E-Card value.
+ * The html of the ecard value.
*
* @todo
* Implementing theme functions.
@@ -181,9 +181,12 @@ function ecard_render_ecard($hash, $args, $options) {
&& $ecard->entity_id == $args['entity_id']) {
$ecard->text = token_replace($ecard->text, (array) $ecard);
- $element['ecard'] = $ecard;
- $element['entity'] = entity_load($ecard->entity_type, array($ecard->entity_id));
- $ecard_render .= theme('ecard_formatter_view', $element);
+ $variables['ecard'] = $ecard;
+ $variables['entity'] = entity_load($ecard->entity_type, array($ecard->entity_id));
+ $variables['name_to'] = t('Hey @name_to,', array('@name_to' => $ecard->name_to));
+ $variables['content'] = $ecard->text;
+ $variables['footer'] = t('Regards @name_from', array('@name_from' => $ecard->name_from));
+ $ecard_render .= theme('ecard_formatter_view', $variables);
}
}
}
diff --git ecard/includes/ecard.field.inc ecard/includes/ecard.field.inc
index 92de03e..7390961 100644
--- ecard/includes/ecard.field.inc
+++ ecard/includes/ecard.field.inc
@@ -2,7 +2,7 @@
/**
* @file
- * Field for the E-Card module to display the input form or an E-Card output.
+ * Field for the ecard module to display the input form or an ecard output.
*/
/**
@@ -11,8 +11,8 @@
function ecard_field_info() {
return array(
'ecard' => array(
- 'label' => t('E-Card Form'),
- 'description' => t('Create an E-Card Form for this content.'),
+ 'label' => t('Ecard Form'),
+ 'description' => t('Create an Ecard Form for this content.'),
'default_widget' => 'ecard_widget',
'default_formatter' => 'ecard_formatter_html',
),
@@ -49,13 +49,13 @@ function ecard_field_widget_form(&$form, &$form_state, $field, $instance, $langc
$element['id'] = array(
'#title' => t('Id'),
'#type' => 'textfield',
- '#description' => 'CSS id for the E-Card div.',
+ '#description' => 'CSS id for the ecard div.',
'#default_value' => isset($items[0]['id']) ? $items[0]['id'] : '',
);
$element['class'] = array(
'#title' => t('Class'),
'#type' => 'textfield',
- '#description' => 'CSS class for the E-Card div.',
+ '#description' => 'CSS class for the ecard div.',
'#default_value' => isset($items[0]['class']) ? $items[0]['class'] : 'ecard-message',
);
$element['top'] = array(
@@ -79,7 +79,7 @@ function ecard_field_widget_form(&$form, &$form_state, $field, $instance, $langc
$element['color'] = array(
'#title' => t('Color'),
'#type' => 'textfield',
- '#description' => 'Color of the E-Card message to be displayed in hexadecimal. Don\'t use "#"',
+ '#description' => 'Color of the ecard message to be displayed in hexadecimal. Don\'t use "#"',
'#default_value' => isset($items[0]['color']) ? $items[0]['color'] : '000000',
);
$element['font'] = array(
@@ -109,7 +109,7 @@ function ecard_field_widget_form(&$form, &$form_state, $field, $instance, $langc
function ecard_form_field_ui_field_edit_form_alter(&$form, $form_state) {
$field = $form['#field'];
if ($field['type'] == 'ecard') {
- // Multiple values is not supported with E-Card.
+ // Multiple values is not supported with ecard.
$form['field']['cardinality']['#access'] = FALSE;
$form['field']['cardinality']['#value'] = 1;
}
@@ -129,10 +129,10 @@ function ecard_field_instance_settings_form($field, $instance) {
* @todo Add cron support. Maybe with rules.
$form['ecard_settings']['ecard_cron'] = array(
'#type' => 'textfield',
- '#title' => t('Days to keep E-Cards'),
+ '#title' => t('Days to keep ecards'),
'#size' => '3',
'#default_value' => isset($instance['settings']['ecard_settings']['ecard_cron']) ? $instance['settings']['ecard_settings']['ecard_cron'] : 0,
- '#description' => t('E-Cards older than the value entered here will automatically be deleted when cron runs. To prevent E-Card deletion, set this value to 0.'),
+ '#description' => t('Ecards older than the value entered here will automatically be deleted when cron runs. To prevent ecard deletion, set this value to 0.'),
);
*/
/**
@@ -149,9 +149,9 @@ function ecard_field_instance_settings_form($field, $instance) {
// @todo: use tokens!
$form['ecard_settings']['ecard_redirect'] = array(
'#type' => 'textfield',
- '#title' => t('Redirection after the E-Card was send.'),
+ '#title' => t('Redirection after the ecard is sent.'),
'#default_value' => isset($instance['settings']['ecard_settings']['ecard_redirect']) ? $instance['settings']['ecard_settings']['ecard_redirect'] : '',
- '#description' => t('Enter the path to where users should be redirected to after sending an E-Card. For example node/123. Leave blank for redirection to the submitted E-Card.'),
+ '#description' => t('Enter the path to where users should be redirected to after sending an ecard. For example node/123. Leave blank for redirection to the submitted ecard.'),
);
$form['ecard_settings']['ecard_require_name'] = array(
'#type' => 'checkbox',
@@ -169,15 +169,15 @@ function ecard_field_instance_settings_form($field, $instance) {
'#default_value' => isset($instance['settings']['ecard_settings']['ecard_fill_in_name_e-mail']) ? $instance['settings']['ecard_settings']['ecard_fill_in_name_e-mail'] : 0,
);
- // E-Card Delivery message.
+ // Ecard Delivery message.
$form['letter'] = array('#title' => t('Delivery message'), '#type' => 'fieldset', '#collapsed' => TRUE, '#collapsible' => TRUE);
$form['letter']['ecard_subject'] = array(
'#type' => 'textfield',
'#title' => t('Subject'),
'#size' => 70,
'#maxlength' => 70,
- '#default_value' => isset($instance['settings']['letter']['ecard_subject']) ? $instance['settings']['letter']['ecard_subject'] : 'E-Card from [site:name]',
- '#description' => t('Customize the subject for E-Card'),
+ '#default_value' => isset($instance['settings']['letter']['ecard_subject']) ? $instance['settings']['letter']['ecard_subject'] : 'Ecard from [site:name]',
+ '#description' => t('Customize the subject for ecard'),
);
$form['letter']['ecard_letter'] = array(
'#type' => 'textarea',
@@ -185,14 +185,14 @@ function ecard_field_instance_settings_form($field, $instance) {
'#cols' => 70,
'#rows' => 5,
'#default_value' => isset($instance['settings']['letter']['ecard_letter']) ? $instance['settings']['letter']['ecard_letter'] : _ecard_letter(),
- '#description' => t('This text is the body of the e-mail that the E-Card recipient will see. These are the variables you may use: %site = your site name, %site_url = your site URL, %site_mail = your site e-mail address, %card_url = the URL for the E-Card, %sender = sender name, %sender_e-mail = sender e-mail, %recipient = recipient e-mail'),
+ '#description' => t('This text is the body of the e-mail that the ecard recipient will see. These are the variables you may use: %site = your site name, %site_url = your site URL, %site_mail = your site e-mail address, %card_url = the URL for the ecard, %sender = sender name, %sender_e-mail = sender e-mail, %recipient = recipient e-mail'),
);
- // E-Card copy notification.
+ // Ecard copy notification.
$form['copy'] = array('#title' => t("Sender's copy message"), '#type' => 'fieldset', '#collapsed' => TRUE, '#collapsible' => TRUE);
$form['copy']['ecard_copy_enabled'] = array(
'#type' => 'checkbox',
- '#title' => t('Send a copy of E-Cards to sender'),
+ '#title' => t('Send a copy of ecards to sender'),
'#default_value' => isset($instance['settings']['copy']['ecard_copy_enabled']) ? $instance['settings']['copy']['ecard_copy_enabled'] : TRUE,
);
$form['copy']['ecard_copy_subject'] = array(
@@ -200,8 +200,8 @@ function ecard_field_instance_settings_form($field, $instance) {
'#title' => t('Subject'),
'#size' => 70,
'#maxlength' => 70,
- '#default_value' => isset($instance['settings']['copy']['ecard_copy_subject']) ? $instance['settings']['copy']['ecard_copy_subject'] : 'A copy of your E-Card',
- '#description' => t('Customise the e-mail sent to the sender as copy of the E-Card.'),
+ '#default_value' => isset($instance['settings']['copy']['ecard_copy_subject']) ? $instance['settings']['copy']['ecard_copy_subject'] : 'A copy of your ecard',
+ '#description' => t('Customise the e-mail sent to the sender as copy of the ecard.'),
);
$form['copy']['ecard_copy'] = array(
'#type' => 'textarea',
@@ -209,7 +209,7 @@ function ecard_field_instance_settings_form($field, $instance) {
'#cols' => 70,
'#rows' => 5,
'#default_value' => isset($instance['settings']['copy']['ecard_copy']) ? $instance['settings']['copy']['ecard_copy'] : _ecard_copy(),
- '#description' => t('This text is the body of the e-mail to notice the sender that his E-Card has been picked up. These are the variables you may use: %site = your site name, %site_url = your site URL, %site_mail = your site e-mail address, %card_url = the URL for the E-Card'),
+ '#description' => t('This text is the body of the e-mail to notice the sender that his ecard has been picked up. These are the variables you may use: %site = your site name, %site_url = your site URL, %site_mail = your site e-mail address, %card_url = the URL for the ecard'),
);
// Notification settings.
@@ -219,7 +219,7 @@ function ecard_field_instance_settings_form($field, $instance) {
$form['notice'] = array('#title' => t('Collection notification message'), '#type' => 'fieldset', '#collapsed' => TRUE, '#collapsible' => TRUE);
$form['notice']['ecard_notice_enabled'] = array(
'#type' => 'checkbox',
- '#title' => t('Enable option for E-Card collection notification e-mails'),
+ '#title' => t('Enable option for ecard collection notification e-mails'),
'#default_value' => isset($instance['settings']['notice']['ecard_notice_enabled']) ? $instance['settings']['notice']['ecard_notice_enabled'] : TRUE,
);
$form['notice']['ecard_notice_subject'] = array(
@@ -227,8 +227,8 @@ function ecard_field_instance_settings_form($field, $instance) {
'#title' => t('Subject'),
'#size' => 70,
'#maxlength' => 70,
- '#default_value' => isset($instance['settings']['notice']['ecard_notice_subject']) ? $instance['settings']['notice']['ecard_notice_subject'] : 'Your E-Card has been just picked up',
- '#description' => t('Customize the subject for E-Card'),
+ '#default_value' => isset($instance['settings']['notice']['ecard_notice_subject']) ? $instance['settings']['notice']['ecard_notice_subject'] : 'Your ecard has been just picked up',
+ '#description' => t('Customize the subject for ecard'),
);
$form['notice']['ecard_notice'] = array(
'#type' => 'textarea',
@@ -236,7 +236,7 @@ function ecard_field_instance_settings_form($field, $instance) {
'#cols' => 70,
'#rows' => 5,
'#default_value' => isset($instance['settings']['notice']['ecard_notice']) ? $instance['settings']['notice']['ecard_notice'] : _ecard_notice(),
- '#description' => t('This text is the body of the e-mail to notice the sender that the E-Card has been picked up. These are the variables you may use: %site = your site name, %site_url = your site URL, %site_mail = your site e-mail address, %card_url = the URL for the E-Card, %sender = sender name, %recipient = recipient e-mail'),
+ '#description' => t('This text is the body of the e-mail to notice the sender that the ecard has been picked up. These are the variables you may use: %site = your site name, %site_url = your site URL, %site_mail = your site e-mail address, %card_url = the URL for the ecard, %sender = sender name, %recipient = recipient e-mail'),
);
*
*/
@@ -254,7 +254,7 @@ function ecard_field_formatter_info() {
'settings' => array('show_ecard' => 1, 'show_form' => 0, 'form_position' => 'below'),
),
'ecard_formatter_image' => array(
- 'label' => t('E-Card image'),
+ 'label' => t('Ecard image'),
'field types' => array('image'),
'settings' => array('image_style' => '',),
),
@@ -268,25 +268,25 @@ function ecard_field_formatter_settings_form($field, $instance, $view_mode, $for
$display = $instance['display'][$view_mode];
$settings = $display['settings'];
-// Settings for E-Card field formater.
+// Settings for ecard field formater.
if ($field['type'] === 'ecard') {
$element['show_ecard'] = array(
'#title' => t('Show ecard text'),
'#type' => 'checkbox',
- '#description' => t('Show the E-Card text if the E-Card is available. You can also show the E-Card by an image field.'),
+ '#description' => t('Show the ecard text if the ecard is available. You can also show the ecard by an image field.'),
'#default_value' => $settings['show_ecard'],
);
$element['show_form'] = array(
'#title' => t('Show form'),
'#type' => 'checkbox',
- '#description' => t('Show the E-Card form if an E-Card is available. If no E-Card is available the form is always been shown.'),
+ '#description' => t('Show the ecard form if an ecard is available. If no ecard is available the form is always been shown.'),
'#default_value' => $settings['show_form'],
);
$element['form_position'] = array(
'#title' => t('Form position'),
'#type' => 'select',
'#description' => 'If the form is shown, where shall it apear.',
- '#options' => array('above' => t('Above the E-Card text'), 'below' => t('Below the E-Card text')),
+ '#options' => array('above' => t('Above the ecard text'), 'below' => t('Below the ecard text')),
'#default_value' => $settings['form_position'],
);
}
@@ -314,7 +314,7 @@ function ecard_field_formatter_settings_summary($field, $instance, $view_mode) {
$settings = $instance['display'][$view_mode]['settings'];
$summary = array();
- // Summary for E-Card field.
+ // Summary for ecard field.
if ($field['type'] === 'ecard') {
$summary[] = t('Show ecard: ') . $settings['show_ecard'];
$summary[] = t('Show form: ') . $settings['show_form'];
@@ -418,7 +418,7 @@ function ecard_field_formatter_view($entity_type, $entity, $field, $instance, $l
/**
* @return
- * The valid hash of an E-Card. If no valid hash is available it returns FALSE.
+ * The valid hash of an ecard. If no valid hash is available it returns FALSE.
*/
function ecard_get_hash() {
if (!empty($_GET['ecard'])) {
@@ -431,17 +431,17 @@ function ecard_get_hash() {
}
/**
- * Returns an array of arguments for an E-Card. This arguments are necessary
- * to save or view an E-Card with a formatter.
+ * Returns an array of arguments for an ecard. This arguments are necessary
+ * to save or view an ecard with a formatter.
* @param $entity
* The entity, where the ecard is saved in.
* @param $field
- * The field array, for the E-Card or the image field.
+ * The field array, for the ecard or the image field.
* @param $instance
* The instance array of the $field field.
*
* @return
- * An array of arguments for E-Cards.
+ * An array of arguments for ecards.
*/
function ecard_get_args($entity_type, $entity, $field, $instance) {
@@ -462,10 +462,10 @@ function ecard_get_args($entity_type, $entity, $field, $instance) {
}
/**
- * The E-Card creation form. Called by drupal_get_form
+ * The ecard creation form. Called by drupal_get_form
*
* @return
- * The E-Card creation form.
+ * The ecard creation form.
*/
function ecard_form_create_ecard($form, &$form_state) {
@@ -517,7 +517,7 @@ function ecard_form_create_ecard($form, &$form_state) {
$form['text'] = array(
'#title' => t('Your message'),
'#type' => 'textarea',
- '#description' => t('Whatever you type here will be displayed with the E-Card'),
+ '#description' => t('Whatever you type here will be displayed with the ecard'),
//'#tree' => FALSE,
);
@@ -527,7 +527,7 @@ function ecard_form_create_ecard($form, &$form_state) {
$form['submit'] = array(
'#type' => 'submit',
- '#value' => t('Send This E-Card'),
+ '#value' => t('Send this e-card'),
'#weight' => 100
);
diff --git ecard/includes/ecard.mail.inc ecard/includes/ecard.mail.inc
index 9d3de4a..8526a0f 100644
--- ecard/includes/ecard.mail.inc
+++ ecard/includes/ecard.mail.inc
@@ -1,11 +1,11 @@
mail_to, $ecard->name_to);
- $send_message = t('Your E-Card was send.');
+ $send_message = t('Your ecard was sent.');
break;
case 'ecard_copy':
$to = ecard_recipient($ecard->mail_from, $ecard->name_from);
- $send_message = t('A copy of your E-Card was send to you.');
+ $send_message = t('A copy of your ecard was sent to you.');
break;
}
if ($ecard->mail_from) {
@@ -79,4 +79,4 @@ function ecard_recipient($mail, $name = NULL) {
else {
return $mail;
}
-}
\ No newline at end of file
+}
diff --git ecard/includes/ecard.theme.inc ecard/includes/ecard.theme.inc
index 48c9a4e..cd603b2 100644
--- ecard/includes/ecard.theme.inc
+++ ecard/includes/ecard.theme.inc
@@ -54,7 +54,7 @@ function ecard_theme() {
}
/**
- * Returns HTML for an E-Card image field formatter.
+ * Returns HTML for an ecard image field formatter.
*
* @param $variables
* An associative array containing:
diff --git ecard/includes/ecard.token.inc ecard/includes/ecard.token.inc
index b293bed..936491c 100644
--- ecard/includes/ecard.token.inc
+++ ecard/includes/ecard.token.inc
@@ -6,31 +6,31 @@
function ecard_token_info() {
$types['ecard'] = array(
- 'name' => t('E-Card'),
- 'description' => t('Tokens for the E-Card module'),
+ 'name' => t('Ecard'),
+ 'description' => t('Tokens for the ecard module'),
);
$ecard['name_from'] = array(
- 'name' => t('Name sender'),
- 'description' => t('The name of the E-Card sender.'),
+ 'name' => t("Sender's name"),
+ 'description' => t('The name of the ecard sender.'),
);
$ecard['mail_from'] = array(
- 'name' => 'Mail sender',
- 'description' => t('The mail adress of the E-Card sender.'),
+ 'name' => t("Sender's email address"),
+ 'description' => t('The email adress of the ecard sender.'),
);
$ecard['name_to'] = array(
- 'name' => t('Name receiver'),
- 'description' => t('The name of the E-Card receiver.'),
+ 'name' => t("Recipient's name"),
+ 'description' => t('The name of the ecard recipient.'),
);
$ecard['mail_to'] = array(
- 'name' => 'Mail receiver',
- 'description' => t('The mail adress of the E-Card receiver.'),
+ 'name' => t("Recipient's email address"),
+ 'description' => t('The mail adress of the ecard recipient.'),
);
$ecard['ecard_url'] = array(
- 'name' => 'E-Card URL',
- 'description' => t('The URL of the E-Card.'),
+ 'name' => t('Ecard URL'),
+ 'description' => t('The URL of the ecard.'),
);
return array(
diff --git ecard/tests/ecard.test ecard/tests/ecard.test
index 99cb55a..c00f957 100644
--- ecard/tests/ecard.test
+++ ecard/tests/ecard.test
@@ -8,9 +8,9 @@ class EcardTestCase extends DrupalWebTestCase {
public static function getInfo() {
return array(
- 'name' => 'E-Card',
- 'description' => 'Tests for the E-Card system.',
- 'group' => 'E-Card',
+ 'name' => 'Ecard',
+ 'description' => 'Tests for the ecard system.',
+ 'group' => 'Ecard',
);
}
diff --git ecard/theme/ecard_field.tpl.php ecard/theme/ecard_field.tpl.php
index ab2a092..9282e1e 100644
--- ecard/theme/ecard_field.tpl.php
+++ ecard/theme/ecard_field.tpl.php
@@ -1,11 +1,11 @@
-
Hey name_to ?>,
-
text ?>
-
Regards name_from ?>
-