Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #33 from fb83/master

added some german translations, translated into german
  • Loading branch information...
commit 0f632aa31e83eb7a263e67753d1f698c9e51d0a9 2 parents 06c30b7 + c413dfb
@phpfreak authored
View
2  application/plugins/links/controllers/LinksController.class.php
@@ -38,7 +38,7 @@ function index() {
tpl_assign('folders', active_project()->getFolders());
//tpl_assign('folder_tree', ProjectFolders::getProjectFolderTree(active_project()));
tpl_assign('folder_tree', array() );
- $this->setSidebar(get_template_path('index_sidebar', 'files'));
+ $this->setSidebar(get_template_path('index_sidebar', 'links'));
} // index
function add_link() {
View
2  application/plugins/links/views/edit_link.php
@@ -32,10 +32,12 @@
<?php echo textarea_field('project_link[description]', array_var($project_link_data, 'description'), array('id' => 'linkFormDescription', 'class' => 'long')) ?>
</div>
+ <?php if (plugin_active('files')) { ?>
<div>
<?php echo label_tag(lang('folder'), 'linkFormFolder', true) ?>
<?php echo select_project_folder('project_link[folder_id]', active_project(), array_var($project_link_data, 'folder_id'), array('id' => 'linkFormFolder')) ?>
</div>
+ <?php } ?>
<?php if (plugin_active('tags')) { ?>
<fieldset>
View
3  application/views/dashboard/my_tasks.php
@@ -87,6 +87,9 @@
<?php if ($assigned_task->getTaskList() instanceof ProjectTaskList) { ?>
(<?php echo lang('project') ?> <a href="<?php echo $assigned_task->getTaskList()->getViewUrl() ?>"><?php echo clean($assigned_task->getTaskList()->getName()) ?></a>)
<div class="options">
+ <?php if ($assigned_task->canView(logged_user())) { ?>
+ <a href="<?php echo $assigned_task->getViewUrl() ?>" class="blank"><?php echo lang('view task') ?></a>&nbsp;
+ <?php } // if ?>
<?php if ($assigned_task->canEdit(logged_user())) { ?>
<a href="<?php echo $assigned_task->getEditUrl() ?>" class="blank"><?php echo lang('edit task') ?></a>&nbsp;
<?php } // if ?>
View
2,814 language/de_de/all.php
1,490 additions, 1,324 deletions not shown
View
1  public/install/installation/templates/db/mysql/initial_data.php
@@ -26,6 +26,7 @@
INSERT INTO `<?php echo $table_prefix ?>config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'default_project_folders', 'images\r\ndocuments\r\nother\r\n', 'TextConfigHandler', 0, 3, NULL);
INSERT INTO `<?php echo $table_prefix ?>config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'theme', 'marine', 'ThemeConfigHandler', 0, 0, NULL);
INSERT INTO `<?php echo $table_prefix ?>config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'logout_redirect_page', 'default', 'StringConfigHandler', '0', '0', 'Logout Redirect mod by Alex: Redirect to a set page upon logout');
+INSERT INTO `<?php echo $table_prefix ?>config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('general', 'installation_base_language', 'en_us', 'StringConfigHandler', '0', '12', 'used base language of installation');
INSERT INTO `<?php echo $table_prefix ?>config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'exchange_compatible', '0', 'BoolConfigHandler', 0, 90, NULL);
INSERT INTO `<?php echo $table_prefix ?>config_options` (`category_name`, `name`, `value`, `config_handler_class`, `is_system`, `option_order`, `dev_comment`) VALUES ('mailing', 'mail_transport', 'mail()', 'MailTransportConfigHandler', 0, 10, 'Values: ''mail()'' - try to emulate mail() function, ''smtp'' - use SMTP connection');

0 comments on commit 0f632aa

Please sign in to comment.
Something went wrong with that request. Please try again.