fixed some internationalization issues with the bootstrap theme

This commit is contained in:
Stephan Bergemann 2013-04-15 22:31:21 +02:00
parent b7141a937e
commit 044626daf2
3 changed files with 72 additions and 60 deletions

View File

@ -1,8 +1,15 @@
<?php $this->load->view("defaults/header");?> <?php $this->load->view("defaults/header");?>
<div class="about"> <div class="row">
<h1>About</h1> <div class="span12">
To edit this page edit application/views/about.php. <div class="page-header">
<?php /* <div class="about"> */ ?>
<h1>About</h1>
</div>
</div>
<div class="span12">
To edit this page edit application/views/about.php.
</div>
</div> </div>
<?php $this->load->view("defaults/footer");?> <?php $this->load->view("defaults/footer");?>

View File

@ -1,64 +1,69 @@
<?php $this->load->view("defaults/header");?> <?php $this->load->view("defaults/header");?>
<div class="api"> <div class="row">
<h1>API</h1> <div class="span12">
<p class="explain border">Create pastes from the commandline</p> <div class="page-header">
<h1>API</h1>
</div>
</div>
<div class="span12">
<p class="explain border">Create pastes from the commandline</p>
<h2>API URL</h2> <h2>API URL</h2>
<p class="explain"><code><?php echo site_url('api/create'); ?></code></p> <p class="explain"><code><?php echo site_url('api/create'); ?></code></p>
<h2>Return values</h2> <h2>Return values</h2>
<p class="explain"> <p class="explain">
On success, the API returns the paste URL: <code><?php echo site_url('view/[pasteid]'); ?></code><br /> On success, the API returns the paste URL: <code><?php echo site_url('view/[pasteid]'); ?></code><br />
On error, the API returns the error message: <code>Error: Missing paste text</code> On error, the API returns the error message: <code>Error: Missing paste text</code>
</p> </p>
<h2>POST parameters</h2> <h2>POST parameters</h2>
<p>&nbsp;</p> <p>&nbsp;</p>
<code>text=[your paste text]</code> <code>text=[your paste text]</code>
<p class="explain">The paste content. Required.</p> <p class="explain">The paste content. Required.</p>
<code>title=[title]</code> <code>title=[title]</code>
<p class="explain">Title for the paste.</p> <p class="explain">Title for the paste.</p>
<code>name=[name]</code> <code>name=[name]</code>
<p class="explain">The author's name.</p> <p class="explain">The author's name.</p>
<code>private=1</code> <code>private=1</code>
<p class="explain">Make paste private.</p> <p class="explain">Make paste private.</p>
<code>lang=[language]</code> <code>lang=[language]</code>
<p class="explain"> <p class="explain">
Use alternative syntax highlighting.<br /> Use alternative syntax highlighting.<br />
Possible values: <?php echo $languages; ?> Possible values: <?php echo $languages; ?>
</p> </p>
<code>expire=[minutes]</code> <code>expire=[minutes]</code>
<p class="explain">Set paste expiration.</p> <p class="explain">Set paste expiration.</p>
<code>reply=[pasteid]</code> <code>reply=[pasteid]</code>
<p class="explain">Reply to existing paste.</p> <p class="explain">Reply to existing paste.</p>
<h2>Examples</h2> <h2>Examples</h2>
<p>&nbsp;</p> <p>&nbsp;</p>
<h3>Create paste</h3> <h3>Create paste</h3>
<code>curl -d text='this is my text' <?php echo site_url('api/create'); ?></code> <code>curl -d text='this is my text' <?php echo site_url('api/create'); ?></code>
<p class="explain">Create a paste with the text 'this is my text'.</p> <p class="explain">Create a paste with the text 'this is my text'.</p>
<h3>Create paste from a file</h3> <h3>Create paste from a file</h3>
<code>curl -d private=1 -d name=Herbert --data-urlencode text@/etc/passwd <?php echo site_url('api/create'); ?></code> <code>curl -d private=1 -d name=Herbert --data-urlencode text@/etc/passwd <?php echo site_url('api/create'); ?></code>
<p class="explain">Create a private paste with the author 'Herbert' and the contents of '/etc/passwd'.</p> <p class="explain">Create a private paste with the author 'Herbert' and the contents of '/etc/passwd'.</p>
<h3>Create paste from a php file</h3> <h3>Create paste from a php file</h3>
<code>curl -d lang=php --data-urlencode text@main.php <?php echo site_url('api/create'); ?></code> <code>curl -d lang=php --data-urlencode text@main.php <?php echo site_url('api/create'); ?></code>
<p class="explain">Create a paste with PHP syntax highlighting.</p> <p class="explain">Create a paste with PHP syntax highlighting.</p>
<h3>Get paste ;-)</h3>
<code>curl <?php echo site_url('view/raw/[pasteid]'); ?></code>
<p class="explain">Display paste.</p>
<h3>Get paste ;-)</h3>
<code>curl <?php echo site_url('view/raw/[pasteid]'); ?></code>
<p class="explain">Display paste.</p>
</div>
</div> </div>
<?php $this->load->view("defaults/footer");?> <?php $this->load->view("defaults/footer");?>

View File

@ -44,7 +44,7 @@
<div class="row"> <div class="row">
<div class="span12"> <div class="span12">
<label for="paste"><?php echo lang('paste_yourpaste'); ?> <label for="paste"><?php echo lang('paste_yourpaste'); ?>
<span class="instruction"><?php echo lang('paste_yourpaste_desc'); ?></span> <span class="instruction"> - <?php echo lang('paste_yourpaste_desc'); ?></span>
</label> </label>
</div> </div>
</div> </div>
@ -57,14 +57,14 @@
<div class="row"> <div class="row">
<div class="span8"> <div class="span8">
<div class="control-group"> <div class="control-group">
<label class="control-label" for="optionsCheckbox"><?php echo long('paste_shorturl'); ?></label> <label class="control-label" for="optionsCheckbox"><?php echo lang('paste_shorturl'); ?></label>
<div class="controls"> <div class="controls">
<label class="checkbox"> <label class="checkbox">
<?php <?php
$set = array('name' => 'snipurl', 'id' => 'snipurl', 'value' => '1', 'tabindex' => '5', 'checked' => $snipurl_set); $set = array('name' => 'snipurl', 'id' => 'snipurl', 'value' => '1', 'tabindex' => '5', 'checked' => $snipurl_set);
echo form_checkbox($set); echo form_checkbox($set);
?> ?>
<?php echo long('paste_shorturl_desc'); ?> <?php echo lang('paste_shorturl_desc'); ?>
</label> </label>
</div> </div>
</div> </div>
@ -86,20 +86,20 @@
</div> </div>
<div class="item"> <div class="item">
<label for="expire"><?php echo lang('paste_delete'); ?> <label for="expire"><?php echo lang('paste_delete'); ?>
<span class="instruction"><?php echo lang('paste_delete_desc'); ?></span> <span class="instruction">- <?php echo lang('paste_delete_desc'); ?></span>
</label> </label>
<?php <?php
$expire_extra = 'id="expire" class="select" tabindex="7"'; $expire_extra = 'id="expire" class="select" tabindex="7"';
$options = array( $options = array(
"0" => "Keep Forever", "0" => lang('exp_forever'),
"30" => "30 Minutes", "30" => lang('exp_30min'),
"60" => "1 hour", "60" => lang('exp_1h'),
"360" => "6 Hours", "360" => lang('exp_6h'),
"720" => "12 Hours", "720" => lang('exp_12h'),
"1440" => "1 Day", "1440" => lang('exp_1d'),
"10080" => "1 Week", "10080" => lang('exp_1w'),
"40320" => "4 Weeks" "40320" => lang('exp_4w'),
); );
echo form_dropdown('expire', $options, $expire_set, $expire_extra); ?> echo form_dropdown('expire', $options, $expire_set, $expire_extra); ?>
</div> </div>
</div> </div>