diff --git a/modules/farm/farm_asset/farm_asset.module b/modules/farm/farm_asset/farm_asset.module
index 8c30c6636..59dfc8a9b 100644
--- a/modules/farm/farm_asset/farm_asset.module
+++ b/modules/farm/farm_asset/farm_asset.module
@@ -328,7 +328,7 @@ function farm_asset_entity_view($entity, $type, $view_mode, $langcode) {
$asset_types = farm_asset_type_get_names();
if (!empty($asset_types[$entity->type])) {
$entity->content['type'] = array(
- '#markup' => '
Asset type: ' . $asset_types[$entity->type] . '
',
+ '#markup' => '' . t('Asset type:') . ' ' . $asset_types[$entity->type] . '
',
'#weight' => -102,
);
}
@@ -336,7 +336,7 @@ function farm_asset_entity_view($entity, $type, $view_mode, $langcode) {
// Add the asset ID.
if (!empty($entity->id)) {
$entity->content['id'] = array(
- '#markup' => 'Asset ID: ' . $entity->id . '
',
+ '#markup' => '' . t('Asset ID:') . ' ' . $entity->id . '
',
'#weight' => -101,
);
}
diff --git a/modules/farm/farm_quantity/farm_quantity.module b/modules/farm/farm_quantity/farm_quantity.module
index 1cf895748..ba5dd29ff 100644
--- a/modules/farm/farm_quantity/farm_quantity.module
+++ b/modules/farm/farm_quantity/farm_quantity.module
@@ -253,22 +253,22 @@ function farm_quantity_units($measure = '') {
if ($system == 'metric') {
// Length units.
- $units['length'][] = 'kilometers';
- $units['length'][] = 'meters';
- $units['length'][] = 'centimeters';
+ $units['length'][] = t('kilometers');
+ $units['length'][] = t('meters');
+ $units['length'][] = t('centimeters');
// Weight units.
- $units['weight'][] = 'kilograms';
- $units['weight'][] = 'grams';
+ $units['weight'][] = t('kilograms');
+ $units['weight'][] = t('grams');
// Area units.
- $units['area'][] = 'hectares';
- $units['area'][] = 'square meters';
+ $units['area'][] = t('hectares');
+ $units['area'][] = t('square meters');
// Volume units.
- $units['volume'][] = 'kiloliters';
- $units['volume'][] = 'liters';
- $units['volume'][] = 'milliliters';
+ $units['volume'][] = t('kiloliters');
+ $units['volume'][] = t('liters');
+ $units['volume'][] = t('milliliters');
// Temperature units.
$units['temperature'][] = 'C';
@@ -276,38 +276,38 @@ function farm_quantity_units($measure = '') {
elseif ($system == 'us') {
// Length units.
- $units['length'][] = 'miles';
- $units['length'][] = 'feet';
- $units['length'][] = 'inches';
+ $units['length'][] = t('miles');
+ $units['length'][] = t('feet');
+ $units['length'][] = t('inches');
// Weight units.
- $units['weight'][] = 'tons';
- $units['weight'][] = 'lbs';
- $units['weight'][] = 'ounces';
+ $units['weight'][] = t('tons');
+ $units['weight'][] = t('lbs');
+ $units['weight'][] = t('ounces');
// Area units.
- $units['area'][] = 'acres';
- $units['area'][] = 'square feet';
+ $units['area'][] = t('acres');
+ $units['area'][] = t('square feet');
// Volume units.
- $units['volume'][] = 'cubic yards';
- $units['volume'][] = 'cubic feet';
- $units['volume'][] = 'gallons';
- $units['volume'][] = 'quarts';
- $units['volume'][] = 'cups';
+ $units['volume'][] = t('cubic yards');
+ $units['volume'][] = t('cubic feet');
+ $units['volume'][] = t('gallons');
+ $units['volume'][] = t('quarts');
+ $units['volume'][] = t('cups');
// Temperature units.
- $units['temperature'][] = 'F';
+ $units['temperature'][] = t('F');
}
// Time units are independent of system.
- $units['time'][] = 'years';
- $units['time'][] = 'months';
- $units['time'][] = 'weeks';
- $units['time'][] = 'days';
- $units['time'][] = 'hours';
- $units['time'][] = 'minutes';
- $units['time'][] = 'seconds';
+ $units['time'][] = t('years');
+ $units['time'][] = t('months');
+ $units['time'][] = t('weeks');
+ $units['time'][] = t('days');
+ $units['time'][] = t('hours');
+ $units['time'][] = t('minutes');
+ $units['time'][] = t('seconds');
// If a measure is specified, only return units for that measure.
if (!empty($measure)) {
diff --git a/themes/farm_theme/template.php b/themes/farm_theme/template.php
index b131d540b..356d3c199 100644
--- a/themes/farm_theme/template.php
+++ b/themes/farm_theme/template.php
@@ -151,9 +151,9 @@ function farm_theme_form_views_exposed_form_alter(&$form, &$form_state, $form_id
$form['#prefix'] = '