From: Marvin Thomas Rabe <m.rabe@echtzeitraum.de>
Date: Thu, 6 Oct 2011 20:40:11 +0000 (+0200)
Subject: conflicts solved
X-Git-Tag: v3.0~101^2~2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e345fbd386f3e2c63b6682ae245beb7b24af08fb;p=nextcloud-server.git

conflicts solved
---

e345fbd386f3e2c63b6682ae245beb7b24af08fb
diff --cc apps/calendar/templates/settings.php
index afc35bf7f37,c6664d512dc..4f509283939
--- a/apps/calendar/templates/settings.php
+++ b/apps/calendar/templates/settings.php
@@@ -11,36 -11,36 +11,36 @@@ OC_UTIL::addStyle('', 'jquery.multisele
  ?>
  <form id="calendar">
          <fieldset class="personalblock">
 -		<table class="nostyle">
 -			<tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
 +        <table class="nostyle">
 +            <tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
                  <?php
 -		$continent = '';
 -		foreach($_['timezones'] as $timezone):
 -			$ex=explode('/', $timezone, 2);//obtain continent,city
 -			if (!isset($ex[1])) {
 -				$ex[1] = $ex[0];
 -				$ex[0] = "Other";
 -			}
 -			if ($continent!=$ex[0]):
 -				if ($continent!="") echo '</optgroup>';
 -				echo '<optgroup label="'.$ex[0].'">';
 -			endif;
 -			$city=strtr($ex[1], '_', ' ');
 -			$continent=$ex[0];
 -			echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
 +                $continent = '';
 +                foreach($_['timezones'] as $timezone):
 +                    $ex=explode('/', $timezone, 2);//obtain continent,city
 +                    if (!isset($ex[1])) {
 +                            $ex[1] = $ex[0];
 +                            $ex[0] = "Other";
 +                    }
 +                    if ($continent!=$ex[0]):
 +                        if ($continent!="") echo '</optgroup>';
 +                        echo '<optgroup label="'.$ex[0].'">';
 +                    endif;
-                     $city=$ex[1];
++					$city=strtr($ex[1], '_', ' ');
 +                    $continent=$ex[0];
 +                    echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
                  endforeach;?>
 -                </select></td></tr>
 +            </select></td></tr>
  
 -			<tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
 -				<select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
 -					<option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
 -					<option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
 -				</select>
 -			</td></tr>
 +            <tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
 +                <select style="display: none;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
 +                    <option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
 +                    <option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
 +                </select>
 +            </td></tr>
  
 -		</table>
 +        </table>
  
 -		<?php echo $l->t('Calendar CalDAV syncing address:');?> 
 -  		<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
 +        <?php echo $l->t('Calendar CalDAV syncing address:');?>
 +        <?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?><br />
          </fieldset>
  </form>