MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: fixed i18n string representation in Views 

Fix for a plenty of Views with incorrect localizations (only English
text shown)
pull/4351/head
4ekin 2019-03-21 17:59:02 +03:00
parent 0e8621f6ff
commit 0b33adedc1
50 changed files with 140 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Attributes/index.ctp
View File

@ -46,7 +46,7 @@
$headers = array(
$this->Paginator->sort('date'),
$this->Paginator->sort('event_id'),
$this->Paginator->sort('Event.orgc_id', 'Org'),
$this->Paginator->sort('Event.orgc_id', __('Org')),
$this->Paginator->sort('category'),
$this->Paginator->sort('type'),
$this->Paginator->sort('value'),

2
app/View/Attributes/search.ctp
View File

@ -35,7 +35,7 @@
?>
</fieldset>
<?php
echo $this->Form->button('Search', array('class' => 'btn btn-primary'));
echo $this->Form->button(__('Search'), array('class' => 'btn btn-primary'));
echo $this->Form->end();
?>
</div>

8
app/View/Elements/Events/eventIndexTable.ctp
View File

@ -24,7 +24,7 @@
endif;
if ($isSiteAdmin):
?>
<th class="filter"><?php echo $this->Paginator->sort('owner org');?></th>
<th class="filter"><?php echo $this->Paginator->sort('owner org', __('Owner org'));?></th>
<?php
endif;
endif;
@ -36,7 +36,7 @@
<?php if (Configure::read('MISP.tagging')): ?>
<th class="filter"><?php echo __('Tags');?></th>
<?php endif; ?>
<th title="<?php echo __('Attribute Count');?>"><?php echo $this->Paginator->sort('attribute_count', '#Attr.');?></th>
<th title="<?php echo __('Attribute Count');?>"><?php echo $this->Paginator->sort('attribute_count', __('#Attr.'));?></th>
<?php if (Configure::read('MISP.showCorrelationsOnIndex')):?>
<th title="<?php echo __('Correlation Count');?>"><?php echo __('#Corr.');?></th>
<?php endif; ?>
@ -50,14 +50,14 @@
<th title="<?php echo __('Post Count');?>"><?php echo __('#Posts');?></th>
<?php endif; ?>
<?php if ($isSiteAdmin): ?>
<th><?php echo $this->Paginator->sort('user_id', 'Email');?></th>
<th><?php echo $this->Paginator->sort('user_id', __('Email'));?></th>
<?php endif; ?>
<th class="filter"><?php echo $this->Paginator->sort('date', null, array('direction' => 'desc'));?></th>
<th class="filter"><?php echo $this->Paginator->sort('info');?></th>
<th title="<?php echo $eventDescriptions['distribution']['desc'];?>">
<?php echo $this->Paginator->sort('distribution');?>
</th>
<th class="actions">Actions</th>
<th class="actions"><?php echo __('Actions');?></th>
</tr>
<?php foreach ($events as $event): ?>

2
app/View/Elements/Feeds/View/row_attribute.ctp Normal file → Executable file
View File

@ -84,7 +84,7 @@ if ($object['value'] == 'MERGE') debug($object);
</td>
<td class="short">
<div id = "Attribute_<?php echo $object['uuid']; ?>_to_ids_solid" class="inline-field-solid");">
<?php echo $object['to_ids'] ? 'Yes' : 'No'; ?>
<?php echo $object['to_ids'] ? __('Yes') : __('No'); ?>
</div>
</td>
</td>

2
app/View/Elements/Feeds/eventattribute.ctp
View File

@ -38,7 +38,7 @@
<div id="attributeList" class="attributeListContainer">
<table class="table table-striped table-condensed">
<tr>
<th><?php echo $this->Paginator->sort('timestamp', 'Date');?></th>
<th><?php echo $this->Paginator->sort('timestamp', __('Date'));?></th>
<th><?php echo $this->Paginator->sort('category');?></th>
<th><?php echo $this->Paginator->sort('type');?></th>
<th><?php echo $this->Paginator->sort('value');?></th>

7
app/View/Elements/TagCollections/index_row.ctp Normal file → Executable file
View File

@ -40,13 +40,14 @@
<td class="short action-links">
<?php
if ($isSiteAdmin || $me['org_id'] == $item['TagCollection']['org_id']) {
echo $this->Html->link('', array('action' => 'edit', $item['TagCollection']['id']), array('class' => 'icon-edit', 'title' => 'Edit'));
echo $this->Form->postLink('', array('action' => 'delete', $item['TagCollection']['id']), array('class' => 'icon-trash', 'title' => 'Delete'), __('Are you sure you want to delete "%s"?', $item['TagCollection']['name']));
echo $this->Html->link('', array('action' => 'edit', $item['TagCollection']['id']), array('class' => 'icon-edit', 'title' => __('Edit')));
echo $this->Form->postLink('', array('action' => 'delete', $item['TagCollection']['id']), array('class' => 'icon-trash', 'title' => __('Delete')), __('Are you sure you want to delete "%s"?', $item['TagCollection']['name']));
}
echo sprintf(
'<a href="%s/tag_collections/view/%s.json" class="fa fa-cloud-download black" title="Download configuration" download="tag_collection_%s.json"></a>',
'<a href="%s/tag_collections/view/%s.json" class="fa fa-cloud-download black" title="%s" download="tag_collection_%s.json"></a>',
$baseurl,
h($item['TagCollection']['id']),
__('Download configuration'),
h($item['TagCollection']['id'])
);

6
app/View/Elements/eventattribute.ctp
View File

@ -137,15 +137,15 @@
?>
<th class="context hidden"><?php echo $this->Paginator->sort('id');?></th>
<th class="context hidden">UUID</th>
<th><?php echo $this->Paginator->sort('timestamp', 'Date', array('direction' => 'desc'));?></th>
<th><?php echo $this->Paginator->sort('timestamp', __('Date'), array('direction' => 'desc'));?></th>
<?php
if ($extended):
?>
<th class="event_id"><?php echo $this->Paginator->sort('event_id', 'Event');?></th>
<th class="event_id"><?php echo $this->Paginator->sort('event_id', __('Event'));?></th>
<?php
endif;
?>
<th><?php echo $this->Paginator->sort('Org.name', 'Org'); ?>
<th><?php echo $this->Paginator->sort('Org.name', __('Org')); ?>
<th><?php echo $this->Paginator->sort('category');?></th>
<th><?php echo $this->Paginator->sort('type');?></th>
<th><?php echo $this->Paginator->sort('value');?></th>

2
app/View/Elements/galaxyQuickView.ctp Normal file → Executable file
View File

@ -93,7 +93,7 @@
<?php
if ($isSiteAdmin || ($mayModify && $isAclTagger)):
?>
<span class="useCursorPointer btn btn-inverse addGalaxy" data-target-type="<?php echo h($target_type);?>" data-target-id="<?php echo h($target_id); ?>" role="button" tabindex="0" aria-label="Add new cluster" style="padding: 1px 5px !important;font-size: 12px !important;">Add</span>
<span class="useCursorPointer btn btn-inverse addGalaxy" data-target-type="<?php echo h($target_type);?>" data-target-id="<?php echo h($target_id); ?>" role="button" tabindex="0" aria-label="Add new cluster" style="padding: 1px 5px !important;font-size: 12px !important;"><?php echo __('Add'); ?></span>
<?php
endif;
?>

2
app/View/Elements/generic_table.ctp Normal file → Executable file
View File

@ -5,7 +5,7 @@
'before' => '$(".progress").show()',
'complete' => '$(".progress").hide()',
));
$title = sprintf('<h2>%s</h2>', Inflector::humanize($controller));
$title = sprintf('<h2>%s</h2>', $alias);
if (!empty($description)) {
$description = sprintf('<p>%s</p>', Inflector::humanize($description));
} else {

2
app/View/Elements/global_menu.ctp Normal file → Executable file
View File

@ -4,7 +4,7 @@
array(
'type' => 'root',
'url' => $baseurl . '/',
'html' => (Configure::read('MISP.home_logo') ? $logo = '<img src="' . $baseurl . '/img/custom/' . Configure::read('MISP.home_logo') . '" style="height:24px;">' : 'Home')
'html' => (Configure::read('MISP.home_logo') ? $logo = '<img src="' . $baseurl . '/img/custom/' . Configure::read('MISP.home_logo') . '" style="height:24px;">' : __('Home'))
),
array(
'type' => 'root',

2
app/View/Elements/serverRuleElements/pull.ctp Normal file → Executable file
View File

@ -35,7 +35,7 @@
</tr>
<tr>
<td style="width:120px;">
<p style="color:green;font-weight:bold;">Allowed Orgs (OR)</p>
<p style="color:green;font-weight:bold;"><?php echo __('Allowed Orgs (OR)');?></p>
<select id="orgspullLeftValues" size="5" multiple style="width:185px;">
</select>
</td>

2
app/View/Elements/view_event_graph.ctp Normal file → Executable file
View File

@ -15,7 +15,7 @@
<label id="network-import" class="btn center-in-network-header network-control-btn"><span class="useCursorPointer fa fa-exchange" style="margin-right: 3px;"></span><?php echo __('Export')?></label>
<label id="network-history" class="btn center-in-network-header network-control-btn"><span class="useCursorPointer fa fa-history" style="margin-right: 3px;"></span><?php echo __('History')?></label>
<input type="text" id="network-typeahead" class="center-in-network-header network-typeahead flushright" data-provide="typeahead" size="20" placeholder="Search for an item">
<input type="text" id="network-typeahead" class="center-in-network-header network-typeahead flushright" data-provide="typeahead" size="20" placeholder="<?php echo __('Search for an item');?>">
</div>
<span class="shortcut-help btn btn-xs btn-info">?</span>

2
app/View/Events/export.ctp Normal file → Executable file
View File

@ -95,7 +95,7 @@
<td style="width:150px;">
<?php
if ($k !== 'text') {
echo $this->Html->link('Download', array('action' => 'downloadExport', $k), array('class' => 'btn btn-inverse toggle-left btn.active qet'));
echo $this->Html->link(__('Download'), array('action' => 'downloadExport', $k), array('class' => 'btn btn-inverse toggle-left btn.active qet'));
?>
<button class = "btn btn-inverse toggle-right btn.active qet" id=button<?php echo $i;?> onClick = "generate('<?php echo $temp; ?>')" <?php if (!$type['recommendation']) echo 'disabled';?>><?php echo __('Generate');?></button>
<?php

2
app/View/Events/proposal_event_index.ctp Normal file → Executable file
View File

@ -27,7 +27,7 @@
<th><?php echo $this->Paginator->sort('user_id', __('Email'));?></th>
<?php endif; ?>
<th class="filter">
<?php echo $this->Paginator->sort('date', 'Date', array('direction' => 'desc'));?>
<?php echo $this->Paginator->sort('date', __('Date'), array('direction' => 'desc'));?>
</th>
<th class="filter">
<?php echo $this->Paginator->sort('info');?>

12
app/View/Events/view.ctp
View File

@ -163,7 +163,7 @@
),
sprintf(
'<it type="button" id="showAdvancedSharingButton" title="%s" class="%s" aria-hidden="true" style="margin-left: 5px;"></it>',
'Toggle advanced sharing network viewer',
__('Toggle advanced sharing network viewer'),
'fa fa-share-alt useCursorPointer'
)
)
@ -176,10 +176,10 @@
'key' => __('Published'),
'class' => ($event['Event']['published'] == 0) ? 'background-red bold not-published' : 'published',
'class_value' => ($event['Event']['published'] == 0) ? '' : 'green',
'html' => ($event['Event']['published'] == 0) ? 'No' : '<span class="green bold">Yes</span>' . ((empty($event['Event']['publish_timestamp'])) ? 'N/A' : ' (' . date('Y-m-d H:i:s', ($event['Event']['publish_timestamp'])) . ')')
'html' => ($event['Event']['published'] == 0) ? __('No') : sprintf('<span class="green bold">%s</span>', __('Yes')) . ((empty($event['Event']['publish_timestamp'])) ? __('N/A') : ' (' . date('Y-m-d H:i:s', ($event['Event']['publish_timestamp'])) . ')')
);
$attribute_text = $attribute_count;
$attribute_text .= $object_count > 1 ? sprintf(' (%s Objects)', h($object_count)) : sprintf(' (%s Object)', h($object_count));
$attribute_text .= $object_count > 1 ? sprintf(__(' (%s Objects)'), h($object_count)) : sprintf(__(' (%s Object)'), h($object_count));
$table_data[] = array(
'key' => __('#Attributes'),
'value' => $attribute_text
@ -256,19 +256,19 @@
if ($isSiteAdmin || $me['org_id'] == $delegationRequest['EventDelegation']['org_id']) {
if ($isSiteAdmin) {
$message = sprintf(
'%s has requested that %s take over this event.',
__('%s has requested that %s take over this event.'),
h($delegationRequest['RequesterOrg']['name']),
h($delegationRequest['Org']['name'])
);
} else {
$message = sprintf(
'%s has requested that you take over this event.',
__('%s has requested that you take over this event.'),
h($delegationRequest['RequesterOrg']['name'])
);
}
} else {
$message = sprintf(
'You have requested that %s take over this event.',
__('You have requested that %s take over this event.'),
h($delegationRequest['Org']['name'])
);
}

6
app/View/Feeds/add.ctp Normal file → Executable file
View File

@ -5,11 +5,11 @@
<p><?php echo __('Add a new MISP feed source.');?></p>
<?php
echo $this->Form->input('enabled', array());
echo $this->Form->input('caching_enabled', array());
echo $this->Form->input('caching_enabled', array('label' => __('Caching enabled')));
?>
<div class="input clear"></div>
<?php
echo $this->Form->input('lookup_visible', array());
echo $this->Form->input('lookup_visible', array('label' => __('Lookup visible')));
echo $this->Form->input('name', array(
'div' => 'input clear',
'placeholder' => __('Feed name'),
@ -17,6 +17,7 @@
));
echo $this->Form->input('provider', array(
'div' => 'input clear',
'label' => __('Provider'),
'placeholder' => __('Name of the content provider'),
'class' => 'form-control span6'
));
@ -39,6 +40,7 @@
<?php
echo $this->Form->input('url', array(
'div' => 'input clear',
'label' => __('URL'),
'placeholder' => __('URL of the feed'),
'class' => 'form-control span6'
));

1
app/View/Feeds/edit.ctp Normal file → Executable file
View File

@ -65,6 +65,7 @@
<?php
echo $this->Form->input('url', array(
'div' => 'input clear',
'label' => __('URL'),
'placeholder' => __('URL of the feed'),
'class' => 'form-control span6'
));

1
app/View/Feeds/import_feeds.ctp Normal file → Executable file
View File

@ -7,6 +7,7 @@
<?php
echo $this->Form->input('json', array(
'div' => 'input clear',
'label' => __('JSON'),
'placeholder' => __('Feed metadata JSON'),
'class' => 'form-control span6',
'type' => 'textarea',

10
app/View/Feeds/index.ctp
View File

@ -94,12 +94,12 @@
<?php endif;?>
<th><?php echo $this->Paginator->sort('id');?></th>
<th title="<?php echo __('Enable pulling the feed into your MISP as events/attributes.'); ?>"><?php echo $this->Paginator->sort('enabled');?></th>
<th title="<?php echo __('Enable caching the feed into Redis - allowing for correlations to the feed to be shown.'); ?>"><?php echo $this->Paginator->sort('caching_enabled');?></th>
<th title="<?php echo __('Enable caching the feed into Redis - allowing for correlations to the feed to be shown.'); ?>"><?php echo $this->Paginator->sort('caching_enabled', __('Caching enabled'));?></th>
<th><?php echo $this->Paginator->sort('name');?></th>
<th><?php echo $this->Paginator->sort('source_format', __('Feed Format'));?></th>
<th><?php echo $this->Paginator->sort('provider');?></th>
<th><?php echo $this->Paginator->sort('provider', __('Provider'));?></th>
<th><?php echo $this->Paginator->sort('input_source', __('Input'));?></th>
<th><?php echo $this->Paginator->sort('url');?></th>
<th><?php echo $this->Paginator->sort('url', __('URL'));?></th>
<th><?php echo $this->Paginator->sort('headers');?></th>
<th><?php echo __('Target');?></th>
<th><?php echo __('Publish');?></th>
@ -107,7 +107,7 @@
<th><?php echo __('Override IDS');?></th>
<th><?php echo $this->Paginator->sort('distribution');?></th>
<th><?php echo $this->Paginator->sort('tag');?></th>
<th><?php echo $this->Paginator->sort('lookup_visible');?></th>
<th><?php echo $this->Paginator->sort('lookup_visible', __('Lookup visible'));?></th>
<th class="actions"><?php echo __('Caching');?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr><?php
@ -279,7 +279,7 @@ foreach ($feeds as $item):
}
if ($isSiteAdmin):
?>
<a href="<?php echo $baseurl;?>/feeds/edit/<?php echo h($item['Feed']['id']); ?>"><span class="icon-edit" title="Edit">&nbsp;</span></a>
<a href="<?php echo $baseurl;?>/feeds/edit/<?php echo h($item['Feed']['id']); ?>"><span class="icon-edit" title="<?php echo __('Edit');?>">&nbsp;</span></a>
<?php echo $this->Form->postLink('', array('action' => 'delete', h($item['Feed']['id'])), array('class' => 'icon-trash', 'title' => __('Delete')), __('Are you sure you want to permanently remove the feed (%s)?', h($item['Feed']['name']))); ?>
<?php endif; ?>
<a href="<?php echo $baseurl;?>/feeds/view/<?php echo h($item['Feed']['id']); ?>.json" title="<?php echo __('Download feed metadata as JSON');?>" download><span class="fa fa-cloud-download black"></span></a>

4
app/View/Feeds/preview_event.ctp Normal file → Executable file
View File

@ -10,7 +10,7 @@
<dl>
<dt><?php echo __('Uuid');?></dt>
<dd><?php echo h($event['Event']['uuid']); ?></dd>
<dt><?php echo Configure::read('MISP.showorgalternate') ? 'Source Organisation' : 'Org'?></dt>
<dt><?php echo Configure::read('MISP.showorgalternate') ? __('Source Organisation') : __('Org')?></dt>
<dd><?php echo h($event['Orgc']['name']); ?></dd>
<?php if (Configure::read('MISP.tagging')): ?>
<dt><?php echo __('Tags');?></dt>
@ -22,7 +22,7 @@
<?php endforeach; ?>&nbsp;
</dd>
<?php endif; ?>
<dt>Date</dt>
<dt><?php echo __('Date');?></dt>
<dd>
<?php echo h($event['Event']['date']); ?>
&nbsp;

12
app/View/Feeds/preview_index.ctp
View File

@ -22,8 +22,8 @@
'children' => array(
array(
'type' => 'search',
'button' => 'Filter',
'placeholder' => 'Enter value to search',
'button' => __('Filter'),
'placeholder' => __('Enter value to search'),
'data' => '',
)
)
@ -35,13 +35,13 @@
<table class="table table-striped table-hover table-condensed">
<tr>
<th class="filter"><?php echo $this->Paginator->sort('Org', 'org'); ?></th>
<th class="filter">Tags</th>
<th class="filter"><?php echo $this->Paginator->sort('Org', __('Org')); ?></th>
<th class="filter"><?php echo __('Tags');?></th>
<th class="filter"><?php echo $this->Paginator->sort('date', null, array('direction' => 'desc'));?></th>
<th class="filter" title="<?php echo $eventDescriptions['threat_level_id']['desc'];?>"><?php echo $this->Paginator->sort('threat_level_id');?></th>
<th class="filter" title="<?php echo $eventDescriptions['analysis']['desc']; ?>"><?php echo $this->Paginator->sort('analysis');?></th>
<th class="filter"><?php echo $this->Paginator->sort('info');?></th>
<th class="filter"><?php echo $this->Paginator->sort('timestamp', null, array('direction' => 'desc'));?></th>
<th class="filter"><?php echo $this->Paginator->sort('timestamp', __('Timestamp'), array('direction' => 'desc'));?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr>
@ -69,7 +69,7 @@
</td>
<td ondblclick="document.location.href ='<?php echo $eventViewURL . h($uuid);?>'" class="short"><?php echo h($event['timestamp']); ?></td>
<td class="short action-links">
<?php if ($feed['Feed']['enabled'] && $isSiteAdmin) echo $this->Form->postLink('', '/feeds/getEvent/' . $id . '/' . $uuid, array('class' => 'icon-download', 'title' => 'Fetch the event'), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Feed.id'))); ?>
<?php if ($feed['Feed']['enabled'] && $isSiteAdmin) echo $this->Form->postLink('', '/feeds/getEvent/' . $id . '/' . $uuid, array('class' => 'icon-download', 'title' => __('Fetch the event')), __('Are you sure you want to fetch and save this event on your instance?', $this->Form->value('Feed.id'))); ?>
<a href='<?php echo $eventViewURL . h($uuid);?>' class = "icon-list-alt" title = "<?php echo __('View');?>"></a>
</td>
</tr>

12
app/View/Galaxies/index.ctp
View File

@ -19,12 +19,12 @@
<table class="table table-striped table-hover table-condensed">
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo $this->Paginator->sort('icon');?></th>
<th><?php echo $this->Paginator->sort('icon', __('Icon'));?></th>
<th><?php echo $this->Paginator->sort('name');?></th>
<th><?php echo $this->Paginator->sort('version');?></th>
<th><?php echo $this->Paginator->sort('namespace');?></th>
<th><?php echo $this->Paginator->sort('description');?></th>
<th class="actions"><?php echo $this->Paginator->sort('description');?></th>
<th><?php echo $this->Paginator->sort('namespace', __('Namespace'));?></th>
<th class="description"><?php echo $this->Paginator->sort('description');?></th>
<th><?php echo __('Actions');?></th>
</tr><?php
foreach ($list as $item):?>
<tr>
@ -35,8 +35,8 @@ foreach ($list as $item):?>
<td class="short"><?php echo h($item['Galaxy']['namespace']);?>&nbsp;</td>
<td><?php echo h($item['Galaxy']['description']);?>&nbsp;</td>
<td class="short action-links">
<?php echo $this->Form->postLink('', array('action' => 'delete', $item['Galaxy']['id']), array('class' => 'icon-trash', 'title' => __('Delete')), __('Are you sure you want to delete the Galaxy (%s)?', $item['Galaxy']['name'])); ?>
<?php echo $this->Html->link('', array('action' => 'view', $item['Galaxy']['id']), array('class' => 'icon-list-alt', 'title' => 'View'));?>
<?php echo $this->Form->postLink('', array('action' => 'delete', $item['Galaxy']['id']), array('class' => 'icon-trash', 'title' => __('Delete')), sprintf(__('Are you sure you want to delete the Galaxy (%s)?'), $item['Galaxy']['name'])); ?>
<?php echo $this->Html->link('', array('action' => 'view', $item['Galaxy']['id']), array('class' => 'icon-list-alt', 'title' => __('View')));?>
</td>
</tr><?php
endforeach;?>

2
app/View/GalaxyClusters/ajax/galaxy_cluster_delete_confirmation.ctp Normal file → Executable file
View File

@ -8,7 +8,7 @@
?>
<legend><?php echo __('Galaxy Cluster Deletion');?></legend>
<div style="padding-left:5px;padding-right:5px;padding-bottom:5px;">
<p><?php echo __('Are you sure you want to delete Galaxy Cluster #<?php echo h($id); ?>?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies.');?></p>
<p><?php echo sprintf(__('Are you sure you want to delete Galaxy Cluster %s?<br /> Associated tags will not be removed. You can reload the Galaxy Cluster at any time by force updating your galaxies.'), h($id));?></p>
<table>
<tr>
<td style="vertical-align:top">

14
app/View/GalaxyClusters/ajax/index.ctp Normal file → Executable file
View File

@ -32,21 +32,21 @@
</span>
<?php endforeach; ?>
<span class="tabMenuFixed tabMenuFixedRight tabMenuSides">
<?php echo $this->Html->link('', array('controller' => 'galaxies', 'action' => 'view/'. $galaxy_id), array('class' => 'icon-remove', 'title' => 'Remove filters'));?>
<?php echo $this->Html->link('', array('controller' => 'galaxies', 'action' => 'view/'. $galaxy_id), array('class' => 'icon-remove', 'title' => __('Remove filters')));?>
</span>
<?php endif;?>
<span style="border-right:0px !important;">
<span id="quickFilterButton" role="button" tabindex="0" aria-label="Filter value galaxie cluster" class="tabMenuFilterFieldButton useCursorPointer"
onClick="quickFilter('', '<?php echo $baseurl . '/galaxies/view/' . $galaxy_id; ?>');">Filter</span>
onClick="quickFilter('', '<?php echo $baseurl . '/galaxies/view/' . $galaxy_id; ?>');"><?php echo __('Filter');?></span>
<input class="tabMenuFilterField" type="text" id="quickFilterField"></input>
</span>
</div>
<table class="table table-striped table-hover table-condensed">
<tr>
<th><?php echo $this->Paginator->sort('value');?></th>
<th><?php echo $this->Paginator->sort('synonyms');?></th>
<th>Activity</th>
<th>#Events</th>
<th><?php echo $this->Paginator->sort('synonyms', __('Synonyms'));?></th>
<th><?php echo __('Activity');?></th>
<th><?php echo __('#Events');?></th>
<th><?php echo $this->Paginator->sort('description');?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr>
@ -77,8 +77,8 @@
</td>
<td><?php echo h($item['GalaxyCluster']['description']); ?>&nbsp;</td>
<td class="short action-links">
<?php echo $this->Html->link('', array('controller' => 'galaxies', 'action' => 'viewGraph', $item['GalaxyCluster']['id']), array('class' => 'fa fa-share-alt', 'title' => 'View graph'));?>
<?php echo $this->Html->link('', array('action' => 'view', $item['GalaxyCluster']['id']), array('class' => 'icon-list-alt', 'title' => 'View'));?>
<?php echo $this->Html->link('', array('controller' => 'galaxies', 'action' => 'viewGraph', $item['GalaxyCluster']['id']), array('class' => 'fa fa-share-alt', 'title' => __('View graph')));?>
<?php echo $this->Html->link('', array('action' => 'view', $item['GalaxyCluster']['id']), array('class' => 'icon-list-alt', 'title' => __('View')));?>
<span class="icon-trash useCursorPointer" title="<?php echo __('Delete galaxy cluster');?>" role="button" tabindex="0" aria-label="<?php echo __('Delete galaxy cluster');?>" onClick="deleteObject('galaxy_clusters', 'delete', '<?php echo h($item['GalaxyCluster']['id']); ?>', '<?php echo h($item['GalaxyCluster']['id']); ?>');"></span>
</td>
</tr>

22
app/View/GalaxyClusters/view.ctp Normal file → Executable file
View File

@ -8,34 +8,34 @@
<?php echo isset($cluster['Galax']['name']) ? h($cluster['Galaxy']['name']) : h($cluster['GalaxyCluster']['type']) . ': ' . $cluster['GalaxyCluster']['value']; ?>
</h2>
<dl>
<dt>Cluster ID</dt>
<dt><?php echo __('Cluster ID');?></dt>
<dd><?php echo h($cluster['GalaxyCluster']['id']); ?></dd>
<dt>Name</dt>
<dt><?php echo __('Name');?></dt>
<dd><?php echo h($cluster['GalaxyCluster']['value']); ?></dd>
<dt>Parent Galaxy</dt>
<dt><?php echo __('Parent Galaxy');?></dt>
<dd><?php echo $cluster['Galaxy']['name'] ? h($cluster['Galaxy']['name']) : h($cluster['Galaxy']['type']); ?></dd>
<dt>Description</dt>
<dt><?php echo __('Description');?></dt>
<dd><?php echo h($cluster['GalaxyCluster']['description']); ?>&nbsp;</dd>
<dt>UUID</dt>
<dt><?php echo __('UUID');?></dt>
<dd><?php echo h($cluster['GalaxyCluster']['uuid']); ?>&nbsp;</dd>
<dt>Collection UUID</dt>
<dt><?php echo __('Collection UUID');?></dt>
<dd><?php echo h($cluster['GalaxyCluster']['collection_uuid']); ?>&nbsp;</dd>
<dt>Source</dt>
<dt><?php echo __('Source');?></dt>
<dd><?php echo h($cluster['GalaxyCluster']['source']); ?>&nbsp;</dd>
<dt>Authors</dt>
<dt><?php echo __('Authors');?></dt>
<dd>
<?php
$authors = $cluster['GalaxyCluster']['authors'];
if (!empty($authors)) {
echo implode(', ', $authors);
} else {
echo 'N/A';
echo __('N/A');
}
?>
</dd>
<dt>Connector tag</dt>
<dt><?php echo __('Connector tag');?></dt>
<dd><?php echo h($cluster['GalaxyCluster']['tag_name']); ?></dd>
<dt>Events</dt>
<dt><?php echo __('Events');?></dt>
<dd>
<?php
if (isset($cluster['GalaxyCluster']['tag_count'])):

2
app/View/GalaxyElements/ajax/index.ctp Normal file → Executable file
View File

@ -19,7 +19,7 @@
</div>
<table class="table table-striped table-hover table-condensed">
<tr>
<th class="short"><?php echo $this->Paginator->sort('key');?></th>
<th class="short"><?php echo $this->Paginator->sort('key', __('Key'));?></th>
<th><?php echo $this->Paginator->sort('value');?></th>
</tr>
<?php

4
app/View/Organisations/admin_edit.ctp
View File

@ -4,7 +4,7 @@
<legend><?php echo __('Edit Organisation'); ?></legend>
<p style="font-weight:bold;"><?php echo __('If the organisation should have access to this instance, make sure that the Local organisation setting is checked. <br />If you would only like to add a known external organisation for inclusion in sharing groups, uncheck the Local organisation setting.');?></p>
<div style="float:left;width:345px;">
<?php echo $this->Form->input('local', array('label' => 'Local organisation'));?>
<?php echo $this->Form->input('local', array('label' => __('Local organisation')));?>
</div>
<div class="clear"></div>
<hr />
@ -54,7 +54,7 @@
echo $this->Form->input('nationality', array('options' => $countries));
echo $this->Form->input('sector', array('placeholder' => __('For example "financial".'), 'style' => 'width:300px;'));
echo $this->Form->input('type', array('class' => 'input-xxlarge', 'label' => __('Type of organisation'), 'div' => 'clear', 'placeholder' => __('Freetext description of the org.')));
echo $this->Form->input('contacts', array('class' => 'input-xxlarge', 'type' => 'textarea', 'div' => 'clear', 'placeholder' => __('You can add some contact details for the organisation here, if applicable.')));
echo $this->Form->input('contacts', array('class' => 'input-xxlarge', 'label' => __('Contacts'), 'type' => 'textarea', 'div' => 'clear', 'placeholder' => __('You can add some contact details for the organisation here, if applicable.')));
?>
</fieldset>
<?php echo $this->Form->button(__('Submit'), array('class' => 'btn btn-primary'));

2
app/View/Organisations/ajax/merge.ctp
View File

@ -55,7 +55,7 @@
<b><?php echo __('Organisation to be merged');?></b><br />
<b><?php echo __('ID');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['id']);?></span><br />
<b><?php echo __('Name');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['name']);?></span><br />
<b><?php echo __('Uuid');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['uuid']);?></span><br />
<b><?php echo __('UUID');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['uuid']);?></span><br />
<b><?php echo __('Type');?>: </b><span class="red"><?php echo h($currentOrg['Organisation']['local']) ? 'Local' : 'External';?></span>
</div>
<div class="span6 highlightedBlock">

2
app/View/Organisations/view.ctp
View File

@ -27,7 +27,7 @@
$table_data[] = array('key' => __('Creation time'), 'value' => $org['Organisation']['date_created']);
$table_data[] = array('key' => __('Last modified'), 'value' => $org['Organisation']['date_modified']);
}
foreach (array('sector' => 'Sector', 'nationality' => 'Nationality', 'type' => 'Organisation type', 'contacts' => 'Contact information') as $k => $field) {
foreach (array('sector' => __('Sector'), 'nationality' => __('Nationality'), 'type' => __('Organisation type'), 'contacts' => __('Contact information')) as $k => $field) {
if (!empty(trim($org['Organisation'][$k]))) {
$table_data[] = array('key' => $field, 'value' => trim(h($org['Organisation'][$k])));
}

2
app/View/Regexp/admin_add.ctp Normal file → Executable file
View File

@ -14,7 +14,7 @@
<?php
echo $this->Form->input('all', array(
'checked' => false,
'label' => 'All',
'label' => __('All'),
));
?>
</div>

8
app/View/Regexp/admin_index.ctp Normal file → Executable file
View File

@ -19,8 +19,8 @@
<table class="table table-striped table-hover table-condensed">
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo $this->Paginator->sort('regexp');?></th>
<th><?php echo $this->Paginator->sort('replacement');?></th>
<th><?php echo $this->Paginator->sort('regexp', __('Regexp'));?></th>
<th><?php echo $this->Paginator->sort('replacement', __('Replacement'));?></th>
<th><?php echo $this->Paginator->sort('type');?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr><?php
@ -31,8 +31,8 @@ foreach ($list as $item):?>
<td><?php echo h($item['Regexp']['replacement']);?>&nbsp;</td>
<td class="short"><?php echo h($item['Regexp']['type']);?>&nbsp;</td>
<td class="short action-links">
<?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Regexp']['id']), array('class' => 'icon-edit', 'title' => 'Edit'));?>
<?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Regexp']['id']), array('class' => 'icon-trash', 'title' => 'Delete'), __('Are you sure you want to delete %s?', h($item['Regexp']['regexp'])));?>
<?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Regexp']['id']), array('class' => 'icon-edit', 'title' => __('Edit')));?>
<?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Regexp']['id']), array('class' => 'icon-trash', 'title' => __('Delete')), __('Are you sure you want to delete %s?', h($item['Regexp']['regexp'])));?>
</td>
</tr><?php
endforeach;?>

4
app/View/Regexp/index.ctp Normal file → Executable file
View File

@ -19,8 +19,8 @@
<table class="table table-striped table-hover table-condensed">
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo $this->Paginator->sort('regexp');?></th>
<th><?php echo $this->Paginator->sort('replacement');?></th>
<th><?php echo $this->Paginator->sort('regexp', __('Regexp'));?></th>
<th><?php echo $this->Paginator->sort('replacement', __('Replacement'));?></th>
<th><?php echo $this->Paginator->sort('type');?></th>
</tr><?php
foreach ($list as $item):?>

2
app/View/Roles/admin_add.ctp
View File

@ -12,7 +12,7 @@
<div class = 'input clear'></div>
<?php
echo $this->Form->input('name');
echo $this->Form->input('permission', array('type' => 'select', 'options' => $options), array('value' => '3'));
echo $this->Form->input('permission', array('type' => 'select', 'label' => __('Permissions'), 'options' => $options), array('value' => '3'));
?>
<div class = 'input clear'></div>
<?php

2
app/View/Roles/admin_edit.ctp
View File

@ -39,7 +39,7 @@
?>
</fieldset>
<?php
echo $this->Form->button('Edit', array('class' => 'btn btn-primary'));
echo $this->Form->button(__('Edit'), array('class' => 'btn btn-primary'));
echo $this->Form->end();
?>
</div>

10
app/View/Roles/admin_index.ctp
View File

@ -21,8 +21,8 @@
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo __('Default');?></th>
<th><?php echo $this->Paginator->sort('name');?></th>
<th><?php echo $this->Paginator->sort('restricted_to_site_admin');?></th>
<th><?php echo $this->Paginator->sort('permission', 'Permission');?></th>
<th><?php echo $this->Paginator->sort('restricted_to_site_admin', __('Restricted to site admins'));?></th>
<th><?php echo $this->Paginator->sort('permission', __('Permissions'));?></th>
<?php
foreach ($permFlags as $k => $flags):
?>
@ -30,8 +30,8 @@
<?php
endforeach;
?>
<th><?php echo $this->Paginator->sort('memory_limit');?></th>
<th><?php echo $this->Paginator->sort('max_execution_time');?></th>
<th><?php echo $this->Paginator->sort('memory_limit', __('Memory limit'));?></th>
<th><?php echo $this->Paginator->sort('max_execution_time', __('Max execution time'));?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr><?php
foreach ($list as $item): ?>
@ -63,7 +63,7 @@ foreach ($list as $item): ?>
?>
</td>
<td class="short action-links">
<?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Role']['id']), array('class' => 'icon-edit', 'title' => 'Edit')); ?>
<?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Role']['id']), array('class' => 'icon-edit', 'title' => __('Edit'))); ?>
<?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Role']['id']), array('class' => 'icon-trash', 'title' => __('Delete')), __('Are you sure you want to delete %s?', $item['Role']['name'])); ?>
</td>
</tr><?php

2
app/View/Roles/index.ctp
View File

@ -21,7 +21,7 @@
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo __('Default');?></th>
<th><?php echo $this->Paginator->sort('name');?></th>
<th><?php echo $this->Paginator->sort('permission', 'Permission');?></th>
<th><?php echo $this->Paginator->sort('permission', __('Permissions'));?></th>
<?php
foreach ($permFlags as $k => $flags):
?>

17
app/View/Servers/rest.ctp
View File

@ -65,11 +65,11 @@
<div class="input clear" style="width:100%;" />
<?php
echo $this->Form->input('use_full_path', array(
'label' => 'Use full path - disclose my apikey',
'label' => __('Use full path - disclose my apikey'),
'type' => 'checkbox'
));
echo $this->Form->input('bookmark', array(
'label' => 'Bookmark query',
'label' => __('Bookmark query'),
'type' => 'checkbox',
'onChange' => 'toggleRestClientBookmark();'
));
@ -78,7 +78,7 @@
<div id="bookmark-name" style="display:none;">
<?php
echo $this->Form->input('name', array(
'label' => 'Bookmark name',
'label' => __('Bookmark name'),
'class' => 'input-xxlarge',
));
?>
@ -86,17 +86,19 @@
<div class="input clear" style="width:100%;" />
<?php
echo $this->Form->input('show_result', array(
'label' => __('Show result'),
'type' => 'checkbox'
));
echo $this->Form->input('skip_ssl_validation', array(
'type' => 'checkbox',
'label' => 'Skip SSL validation'
'label' => __('Skip SSL validation')
));
?>
<div class="input clear" style="width:100%;">
<?php
echo $this->Form->input('header', array(
'type' => 'textarea',
'label' => __('HTTP headers'),
'div' => 'input clear',
'class' => 'input-xxlarge',
'default' => !empty($this->request->data['Server']['header']) ? $this->request->data['Server']['header'] : $header
@ -109,8 +111,8 @@
<h3 id="selected-path" >---</h3>
</div>
<div id="querybuilder"></div>
<button id="btn-inject" type="button" class="btn btn-success"><i class="fa fa-mail-forward" style="transform: scaleX(-1);"></i> Inject </button>
<button id="btn-apply" type="button" class="btn btn-default"><i class="fa fa-list-alt"></i> Show rules </button>
<button id="btn-inject" type="button" class="btn btn-success"><i class="fa fa-mail-forward" style="transform: scaleX(-1);"></i><?php echo __(' Inject')?></button>
<button id="btn-apply" type="button" class="btn btn-default"><i class="fa fa-list-alt"></i><?php echo __(' Show rules')?> </button>
</div>
</div>
@ -119,6 +121,7 @@
<?php
echo $this->Form->input('body', array(
'type' => 'textarea',
'label' => __('HTTP body'),
'div' => 'input clear',
'class' => 'input-xxlarge'
));
@ -126,7 +129,7 @@
<div class="input clear" style="width:100%;">
<div id="template_description" style="display:none;width:700px;" class="alert alert-error">Fill out the JSON template above, make sure to replace all placeholder values. Fields with the value "optional" can be removed.</div>
<?php
echo $this->Form->submit('Run query', array('class' => 'btn btn-primary'));
echo $this->Form->submit(__('Run query'), array('class' => 'btn btn-primary'));
echo $this->Form->end();
?>
<hr />

1
app/View/TagCollections/import.ctp Normal file → Executable file
View File

@ -7,6 +7,7 @@
<?php
echo $this->Form->input('json', array(
'div' => 'input clear',
'label' => __('JSON'),
'placeholder' => __('Tag collection JSON'),
'class' => 'form-control span6',
'type' => 'textarea',

17
app/View/TagCollections/index.ctp Normal file → Executable file
View File

@ -1,18 +1,19 @@
<?php
echo $this->element('generic_table', array(
'items' => $list,
'alias' => __('Tag Collections'),
'controller' => 'tag_collections',
'headers' => array(
'id' => array('sort' => 1),
'uuid' => array('sort' => 1),
'uuid' => array('sort' => 1, 'alias' => __('UUID')),
'name' => array('sort' => 1),
'tags' => array(),
'galaxies' => array(),
'all_orgs' => array(),
'org_id' => array('alias' => 'Organisation'),
'user_id' => array('alias' => 'User'),
'description' => array(),
'Actions' => array()
'tags' => array('alias' => __('Tags')),
'galaxies' => array('alias' => __('Galaxies')),
'all_orgs' => array('alias' => __('All orgs')),
'org_id' => array('alias' => __('Organisation')),
'user_id' => array('alias' => __('User')),
'description' => array('alias' => __('Description')),
'Actions' => array('alias' => __('Actions'))
),
'row_path' => 'TagCollections/index_row'
));

2
app/View/Tags/edit.ctp Normal file → Executable file
View File

@ -1,7 +1,7 @@
<div class="tag form">
<?php echo $this->Form->create('Tag');?>
<fieldset>
<legend><?php echo __('Add Tag');?></legend>
<legend><?php echo __('Edit Tag');?></legend>
<?php
echo $this->Form->input('name', array(
));

8
app/View/Tags/index.ctp Normal file → Executable file
View File

@ -60,8 +60,8 @@
<table class="table table-striped table-hover table-condensed">
<tr>
<th><?php echo $this->Paginator->sort('id');?></th>
<th><?php echo $this->Paginator->sort('exportable');?></th>
<th><?php echo $this->Paginator->sort('hide_tag', 'Hidden');?></th>
<th><?php echo $this->Paginator->sort('exportable', __('Exportable'));?></th>
<th><?php echo $this->Paginator->sort('hide_tag', __('Hidden'));?></th>
<th><?php echo $this->Paginator->sort('name');?></th>
<th><?php echo __('Restricted to org');?></th>
<?php if ($isSiteAdmin): ?>
@ -120,8 +120,8 @@ foreach ($list as $k => $item): ?>
</td>
<?php if ($isSiteAdmin): ?>
<td class="short action-links">
<?php echo $this->Html->link('', array('controller' => 'tags', 'action' => 'viewGraph', $item['Tag']['id']), array('class' => 'fa fa-share-alt', 'title' => 'View graph'));?>
<?php echo $this->Html->link('', array('action' => 'edit', $item['Tag']['id']), array('class' => 'icon-edit', 'title' => 'Edit'));?>
<?php echo $this->Html->link('', array('controller' => 'tags', 'action' => 'viewGraph', $item['Tag']['id']), array('class' => 'fa fa-share-alt', 'title' => __('View graph')));?>
<?php echo $this->Html->link('', array('action' => 'edit', $item['Tag']['id']), array('class' => 'icon-edit', 'title' => __('Edit')));?>
<?php echo $this->Form->postLink('', array('action' => 'delete', $item['Tag']['id']), array('class' => 'icon-trash', 'title' => __('Delete')), __('Are you sure you want to delete "%s"?', $item['Tag']['name']));?>
</td>
<?php endif; ?>

2
app/View/Taxonomies/index.ctp
View File

@ -23,7 +23,7 @@
<th><?php echo $this->Paginator->sort('description');?></th>
<th><?php echo $this->Paginator->sort('version');?></th>
<th><?php echo $this->Paginator->sort('enabled');?></th>
<th><?php echo $this->Paginator->sort('required');?></th>
<th><?php echo $this->Paginator->sort('required', __('Required'));?></th>
<th><?php echo __('Active Tags');?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr><?php

12
app/View/Taxonomies/view.ctp
View File

@ -26,9 +26,9 @@
<?php echo $taxonomy['enabled'] ? '<span class="green">'. __('Yes') . '</span>&nbsp;&nbsp;' : '<span class="red">' . __('No') . '</span>&nbsp;&nbsp;';
if ($isSiteAdmin) {
if ($taxonomy['enabled']) {
echo $this->Form->postLink('(disable)', array('action' => 'disable', h($taxonomy['id'])), array('title' => __('Disable')), (__('Are you sure you want to disable this taxonomy library?')));
echo $this->Form->postLink(__('(disable)'), array('action' => 'disable', h($taxonomy['id'])), array('title' => __('Disable')), (__('Are you sure you want to disable this taxonomy library?')));
} else {
echo $this->Form->postLink('(enable)', array('action' => 'enable', h($taxonomy['id'])), array('title' => __('Enable')), (__('Are you sure you want to enable this taxonomy library?')));
echo $this->Form->postLink(__('(enable)'), array('action' => 'enable', h($taxonomy['id'])), array('title' => __('Enable')), (__('Are you sure you want to enable this taxonomy library?')));
}
}
?>
@ -80,12 +80,12 @@
<?php if ($isAclTagger && !empty($entries)): ?>
<th><input class="select_all" type="checkbox" onClick="toggleAllTaxonomyCheckboxes();" /></th>
<?php endif;?>
<th><?php echo $this->Paginator->sort('tag');?></th>
<th><?php echo $this->Paginator->sort('expanded');?></th>
<th><?php echo $this->Paginator->sort('numerical_value');?></th>
<th><?php echo $this->Paginator->sort('tag', __('Tag'));?></th>
<th><?php echo $this->Paginator->sort('expanded', __('Expanded'));?></th>
<th><?php echo $this->Paginator->sort('numerical_value', __('Numerical value'));?></th>
<th><?php echo $this->Paginator->sort('events');?></th>
<th><?php echo $this->Paginator->sort('attributes');?></th>
<th><?php echo $this->Paginator->sort('tag');?></th>
<th><?php echo $this->Paginator->sort('tag', __('Tags'));?></th>
<th><?php echo __('Action');?></th>
</tr><?php
foreach ($entries as $k => $item): ?>

4
app/View/Users/admin_edit.ctp Executable file → Normal file
View File

@ -34,8 +34,8 @@
<div id="PasswordDiv">
<div class="clear"></div>
<?php
$passwordPopover = '<span class=\"blue bold\">Length</span>: ' . h($length) . '<br />';
$passwordPopover .= '<span class=\"blue bold\">Complexity</span>: ' . h($complexity);
$passwordPopover = '<span class=\"blue bold\">' . __('Length') .'</span>: ' . h($length) . '<br />';
$passwordPopover .= '<span class=\"blue bold\">' . __('Complexity') .'</span>: ' . h($complexity);
echo $this->Form->input('password', array(
'label' => __('Password') . ' <span id = "PasswordPopover" class="icon-info-sign" ></span>'
));

2
app/View/Users/admin_view.ctp
View File

@ -34,7 +34,7 @@ $buttonModifyStatus = $mayModify ? 'button_on':'button_off';
h($user['User']['authkey']),
sprintf(
' (%s)',
$this->Html->link('reset', array('controller' => 'users', 'action' => 'resetauthkey', $user['User']['id']))
$this->Html->link(__('reset'), array('controller' => 'users', 'action' => 'resetauthkey', $user['User']['id']))
)
);
$table_data[] = array(

8
app/View/Users/edit.ctp Normal file → Executable file
View File

@ -7,10 +7,10 @@
?>
<div class="input clear"></div>
<?php
$passwordPopover = '<span class=\"blue bold\">Length</span>: ' . h($length) . '<br />';
$passwordPopover .= '<span class=\"blue bold\">Complexity</span>: ' . h($complexity);
$passwordPopover = '<span class=\"blue bold\">' . __('Length') .'</span>: ' . h($length) . '<br />';
$passwordPopover .= '<span class=\"blue bold\">' . __('Complexity') .'</span>: ' . h($complexity);
echo $this->Form->input('password', array(
'label' => 'Password <span id = "PasswordPopover" class="icon-info-sign" ></span>'
'label' => __('Password') . ' <span id = "PasswordPopover" class="icon-info-sign" ></span>'
));
echo $this->Form->input('confirm_password', array('type' => 'password', 'div' => array('class' => 'input password required')));
?>
@ -20,7 +20,7 @@
?>
<div class="input clear"></div>
<?php
echo $this->Form->input('gpgkey', array('label' => 'GnuPG key', 'div' => 'clear', 'class' => 'input-xxlarge'));
echo $this->Form->input('gpgkey', array('label' => __('GnuPG key'), 'div' => 'clear', 'class' => 'input-xxlarge'));
?>
<div class="clear"><span role="button" tabindex="0" aria-label="<?php echo __('Fetch GnuPG key');?>" onClick="lookupPGPKey('UserEmail');" class="btn btn-inverse" style="margin-bottom:10px;"><?php echo __('Fetch GnuPG key');?></span></div>
<?php

2
app/View/Users/view.ctp
View File

@ -17,7 +17,7 @@
(Configure::read('MISP.disableUserSelfManagement') && !$isAdmin) ? '' :
sprintf(
' (%s)',
$this->Html->link('reset', array('controller' => 'users', 'action' => 'resetauthkey', $user['User']['id']))
$this->Html->link(__('reset'), array('controller' => 'users', 'action' => 'resetauthkey', $user['User']['id']))
)
);
}

4
app/View/Warninglists/index.ctp Normal file → Executable file
View File

@ -32,8 +32,8 @@
<th><?php echo $this->Paginator->sort('version');?></th>
<th><?php echo $this->Paginator->sort('description');?></th>
<th><?php echo $this->Paginator->sort('type');?></th>
<th>Valid attributes</th>
<th><?php echo $this->Paginator->sort('warninglist_entry_count', 'Entries');?></th>
<th><?php echo __('Valid attributes');?></th>
<th><?php echo $this->Paginator->sort('warninglist_entry_count', __('Entries'));?></th>
<th><?php echo $this->Paginator->sort('enabled');?></th>
<th class="actions"><?php echo __('Actions');?></th>
</tr><?php

5
app/View/Whitelists/admin_edit.ctp Normal file → Executable file
View File

@ -9,7 +9,10 @@
));
?>
</fieldset>
<?php echo $this->Form->end(__('Submit'));?>
<?php
echo $this->Form->button(__('Submit'), array('class' => 'btn btn-primary'));
echo $this->Form->end();
?>
</div>
<?php
echo $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'whitelist', 'menuItem' => 'edit', 'id' => $this->Form->value('Whitelist.id')));

4
app/View/Whitelists/admin_index.ctp Normal file → Executable file
View File

@ -28,8 +28,8 @@ foreach ($list as $item):?>
<td class="short"><?php echo h($item['Whitelist']['id']);?>&nbsp;</td>
<td><?php echo h($item['Whitelist']['name']);?>&nbsp;</td>
<td class="short action-links">
<?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Whitelist']['id']), array('class' => 'icon-edit', 'title' => 'Edit'));?>
<?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Whitelist']['id']), array('class' => 'icon-trash', 'title' => 'Delete'), __('Are you sure you want to delete "%s"?', $item['Whitelist']['name']));?>
<?php echo $this->Html->link('', array('admin' => true, 'action' => 'edit', $item['Whitelist']['id']), array('class' => 'icon-edit', 'title' => __('Edit')));?>
<?php echo $this->Form->postLink('', array('admin' => true, 'action' => 'delete', $item['Whitelist']['id']), array('class' => 'icon-trash', 'title' => __('Delete')), __('Are you sure you want to delete "%s"?', $item['Whitelist']['name']));?>
</td>
</tr><?php
endforeach;?>