From 044626daf2acceef080b37931100e3c549929ecb Mon Sep 17 00:00:00 2001
From: Stephan Bergemann <oberling@deroberling.de>
Date: Mon, 15 Apr 2013 22:31:21 +0200
Subject: [PATCH] fixed some internationalization issues with the bootstrap
 theme

---
 htdocs/themes/bootstrap/views/about.php       | 13 ++-
 htdocs/themes/bootstrap/views/api_help.php    | 93 ++++++++++---------
 .../bootstrap/views/defaults/paste_form.php   | 26 +++---
 3 files changed, 72 insertions(+), 60 deletions(-)

diff --git a/htdocs/themes/bootstrap/views/about.php b/htdocs/themes/bootstrap/views/about.php
index d695820..2a54aaa 100644
--- a/htdocs/themes/bootstrap/views/about.php
+++ b/htdocs/themes/bootstrap/views/about.php
@@ -1,8 +1,15 @@
 <?php $this->load->view("defaults/header");?>
 
-<div class="about">
-	<h1>About</h1>
-	To edit this page edit application/views/about.php.
+<div class="row">
+	<div class="span12">
+		<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>
 
 <?php $this->load->view("defaults/footer");?>
diff --git a/htdocs/themes/bootstrap/views/api_help.php b/htdocs/themes/bootstrap/views/api_help.php
index 43982c8..3cd2ea0 100644
--- a/htdocs/themes/bootstrap/views/api_help.php
+++ b/htdocs/themes/bootstrap/views/api_help.php
@@ -1,64 +1,69 @@
 <?php $this->load->view("defaults/header");?>
 
-<div class="api">
-	<h1>API</h1>
-    <p class="explain border">Create pastes from the commandline</p>
+<div class="row">
+	<div class="span12">
+		<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>
-    <p class="explain"><code><?php echo site_url('api/create'); ?></code></p>
+		<h2>API URL</h2>
+	    <p class="explain"><code><?php echo site_url('api/create'); ?></code></p>
 
-	<h2>Return values</h2>
-    <p class="explain">
-        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>
-    </p>
+		<h2>Return values</h2>
+	    <p class="explain">
+		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>
+	    </p>
 
-	<h2>POST parameters</h2>
-    <p>&nbsp;</p>
+		<h2>POST parameters</h2>
+	    <p>&nbsp;</p>
 
-	<code>text=[your paste text]</code>
-    <p class="explain">The paste content. Required.</p>
+		<code>text=[your paste text]</code>
+	    <p class="explain">The paste content. Required.</p>
 
-	<code>title=[title]</code>
-    <p class="explain">Title for the paste.</p>
+		<code>title=[title]</code>
+	    <p class="explain">Title for the paste.</p>
 
-	<code>name=[name]</code>
-    <p class="explain">The author's name.</p>
+		<code>name=[name]</code>
+	    <p class="explain">The author's name.</p>
 
-	<code>private=1</code>
-    <p class="explain">Make paste private.</p>
+		<code>private=1</code>
+	    <p class="explain">Make paste private.</p>
 
-	<code>lang=[language]</code>
-    <p class="explain">
-        Use alternative syntax highlighting.<br />
-        Possible values: <?php echo $languages; ?>
-    </p>
+		<code>lang=[language]</code>
+	    <p class="explain">
+		Use alternative syntax highlighting.<br />
+		Possible values: <?php echo $languages; ?>
+	    </p>
 
-	<code>expire=[minutes]</code>
-    <p class="explain">Set paste expiration.</p>
+		<code>expire=[minutes]</code>
+	    <p class="explain">Set paste expiration.</p>
 
-	<code>reply=[pasteid]</code>
-    <p class="explain">Reply to existing paste.</p>
+		<code>reply=[pasteid]</code>
+	    <p class="explain">Reply to existing paste.</p>
 
-	<h2>Examples</h2>
-    <p>&nbsp;</p>
+		<h2>Examples</h2>
+	    <p>&nbsp;</p>
 
-	<h3>Create paste</h3>
-	<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>
+		<h3>Create paste</h3>
+		<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>
 
-	<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>
-    <p class="explain">Create a private paste with the author 'Herbert' and the contents of '/etc/passwd'.</p>
+		<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>
+	    <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>
-	<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>
-
-	<h3>Get paste ;-)</h3>
-	<code>curl <?php echo site_url('view/raw/[pasteid]'); ?></code>
-    <p class="explain">Display paste.</p>
+		<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>
+	    <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>
+	</div>
 </div>
 
 <?php $this->load->view("defaults/footer");?>
diff --git a/htdocs/themes/bootstrap/views/defaults/paste_form.php b/htdocs/themes/bootstrap/views/defaults/paste_form.php
index a7ca65a..121c84f 100644
--- a/htdocs/themes/bootstrap/views/defaults/paste_form.php
+++ b/htdocs/themes/bootstrap/views/defaults/paste_form.php
@@ -44,7 +44,7 @@
 			<div class="row">
 				<div class="span12">
 					<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>
 				</div>
 			</div>
@@ -57,14 +57,14 @@
 			<div class="row">
 				<div class="span8">
 					<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">
 							<label class="checkbox">
 								<?php
 									$set = array('name' => 'snipurl', 'id' => 'snipurl', 'value' => '1', 'tabindex' => '5', 'checked' => $snipurl_set);
 									echo form_checkbox($set);
 								?>
-								<?php echo long('paste_shorturl_desc'); ?>
+								<?php echo lang('paste_shorturl_desc'); ?>
 							</label>
 						</div>
 					</div>
@@ -86,20 +86,20 @@
 					</div>
 					<div class="item">
 						<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>
 						<?php 
 							$expire_extra = 'id="expire" class="select" tabindex="7"';
 							$options = array(
-											"0" => "Keep Forever",
-											"30" => "30 Minutes",
-											"60" => "1 hour",
-											"360" => "6 Hours",
-											"720" => "12 Hours",
-											"1440" => "1 Day",
-											"10080" => "1 Week",
-											"40320" => "4 Weeks"
-										);
+											"0" => lang('exp_forever'),
+											"30" => lang('exp_30min'),
+											"60" => lang('exp_1h'),
+											"360" => lang('exp_6h'),
+											"720" => lang('exp_12h'),
+											"1440" => lang('exp_1d'),
+											"10080" => lang('exp_1w'),
+											"40320" => lang('exp_4w'),
+									);
 						echo form_dropdown('expire', $options, $expire_set, $expire_extra); ?>
 					</div>
 				</div>