Skip to content

Commit

Permalink
some translations, small css adjustments
Browse files Browse the repository at this point in the history
  • Loading branch information
aaroniker committed Jan 8, 2019
1 parent eb4a7ee commit 4d2a7cf
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
6 changes: 5 additions & 1 deletion gear/language/de.json
Expand Up @@ -6,5 +6,9 @@
"URL <strong>%s</strong> not found": "URL <strong>%s</strong> nicht gefunden",
"Showing %s of %s entries": "Zeige %s von %s Einträgen",
"No entries": "Keine Einträge",
"Search": "Suche"
"Search": "Suche",
"English": "Englisch",
"German": "Deutsch",
"Edit": "Bearbeiten",
"Delete": "Löschen"
}
3 changes: 2 additions & 1 deletion gear/modules/content/language/de.json
@@ -1,3 +1,4 @@
{
"Content": "Inhalt"
"Content": "Inhalt",
"Entries": "Einträge"
}
4 changes: 2 additions & 2 deletions gear/modules/user/views/list.php
Expand Up @@ -12,8 +12,8 @@
<i></i>
</span>
<ul>
<li><a href="">Edit</a></li>
<li class="delete"><a href="">Delete</a></li>
<li><a href=""><?= __('Edit'); ?></a></li>
<li class="delete"><a href=""><?= __('Delete'); ?></a></li>
</ul>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion gear/system/modules/theme/styles/components/buttons.scss
Expand Up @@ -93,7 +93,7 @@
width: 18px;
height: 22px;
display: inline-block;
margin: 1px 0 0 1px;
margin: 1px 0 0 0;
right: -8px;
position: relative;
vertical-align: top;
Expand Down
6 changes: 3 additions & 3 deletions gear/system/modules/theme/views/template.php
Expand Up @@ -108,10 +108,10 @@
<div class="headline">
<h1><?= __($app->view->global('title')); ?></h1>
<div class="dropdown">
<a href="" class="btn border">English<span class="caret"></span></a>
<a href="" class="btn border"><?= __('English'); ?><span class="caret"></span></a>
<ul>
<li><a href="">English</a></li>
<li><a href="">German</a></li>
<li><a href=""><?= __('English'); ?></a></li>
<li><a href=""><?= __('German'); ?></a></li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion gear/system/scripts/table/GTable.vue
Expand Up @@ -216,7 +216,7 @@ export default {
flex-wrap: no-wrap;
width: 100%;
line-height: 21px;
padding: 16px;
padding: 16px 20px;
& > div {
margin-right: 16px;
&:last-child {
Expand Down

0 comments on commit 4d2a7cf

Please sign in to comment.