Completed
Push — master ( ab6422...b16e97 )
by Thomas
27s
created
htdocs/lang/de/ocstyle/main.tpl.php 1 patch
Braces   +15 added lines, -18 removed lines patch added patch discarded remove patch
@@ -145,10 +145,11 @@  discard block
 block discarded – undo
145 145
                         <td><strong>{t}Language:{/t}&nbsp;</strong></td>
146 146
                         <td>
147 147
 <?php
148
-                            foreach ($opt['template']['locales'] AS $k => $lang)
149
-                                if ($lang['status'] == OC_LOCALE_ACTIVE)
148
+                            foreach ($opt['template']['locales'] AS $k => $lang) {
149
+                                                            if ($lang['status'] == OC_LOCALE_ACTIVE)
150 150
                                     echo '<a style="text-decoration: none;" href="index.php?locale=' . $k . '"><img src="' . $lang['flag'] . '" alt="' . $lang['name'] . '" title="' . $lang['name'] . '" width="24px" height="18px" /></a> ';
151
-?>
151
+                            }
152
+                            ?>
152 153
                         </td>
153 154
                         <td>&nbsp;&nbsp;&nbsp;&nbsp;<strong>{t}Country:{/t}&nbsp;</strong></td>
154 155
                         <td>
@@ -157,10 +158,8 @@  discard block
 block discarded – undo
157 158
                                     global $tpl_usercountries;
158 159
                                     $nLastGroup = 0;
159 160
                                     $maxUserCountries = count($tpl_usercountries);
160
-                                    for ($i = 0; $i < $maxUserCountries; $i++)
161
-                                    {
162
-                                        if ($nLastGroup != $tpl_usercountries[$i]['group'])
163
-                                        {
161
+                                    for ($i = 0; $i < $maxUserCountries; $i++) {
162
+                                        if ($nLastGroup != $tpl_usercountries[$i]['group']) {
164 163
                                             echo '<option disabled="disabled">';
165 164
                                             if ($tpl_usercountries[$i]['group'] == 1) {
166 165
                                                 echo '- ' . t('This OC node') . ' -';
@@ -205,11 +204,12 @@  discard block
 block discarded – undo
205 204
                     <ul>
206 205
 <?php
207 206
                         // $pageidx is -1 e.g. when calling newcache.php as logged-off-user (-> login.tpl.php)
208
-                        if ($pageidx >= 0)
209
-                            mnu_EchoMainMenu($menu[$pageidx]['siteid']);
210
-                        else
211
-                            mnu_EchoMainMenu(-1);
212
-?>
207
+                        if ($pageidx >= 0) {
208
+                                                    mnu_EchoMainMenu($menu[$pageidx]['siteid']);
209
+                        } else {
210
+                                                    mnu_EchoMainMenu(-1);
211
+                        }
212
+                        ?>
213 213
                     </ul>
214 214
                 </div>
215 215
 
@@ -228,8 +228,7 @@  discard block
 block discarded – undo
228 228
                 <div class="nav3">
229 229
 <?php
230 230
                     //SubNavigation
231
-                    if (isset($menu[$pageidx]['submenu']))
232
-                    {
231
+                    if (isset($menu[$pageidx]['submenu'])) {
233 232
 ?>
234 233
                         <ul>
235 234
                             <li class="title">{t}Main menu{/t}</li>
@@ -257,8 +256,7 @@  discard block
 block discarded – undo
257 256
 
258 257
                     <!-- Paypalbutton -->
259 258
 <?php
260
-                    if (isset($opt['page']['showdonations']) && $opt['page']['showdonations'])
261
-                    {
259
+                    if (isset($opt['page']['showdonations']) && $opt['page']['showdonations']) {
262 260
 ?>
263 261
                         <p class="sidebar-maintitle">{t}Donations{/t}</p>
264 262
                         <div style="margin-top:16px;width:100%;text-align:center;">
@@ -273,8 +271,7 @@  discard block
 block discarded – undo
273 271
 
274 272
                     <!-- Social Media -->
275 273
 <?php
276
-                    if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia'])
277
-                    {
274
+                    if (isset($opt['page']['showsocialmedia']) && $opt['page']['showsocialmedia']) {
278 275
 ?>
279 276
                     <p class="sidebar-maintitle">{t}Social media{/t}</p>
280 277
                     <div style="margin-top: 10px; margin-bottom: 14px; margin-left: auto; margin-right: auto; text-align: center">
Please login to merge, or discard this patch.
htdocs/config2/locale.inc.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
  *                 $opt['locale']
18 18
  ***************************************************************************/
19 19
 
20
-define('OC_LOCALE_ACTIVE', 2);    // enable language and show language button in header line
21
-define('OC_LOCALE_HIDDEN', 1);    // enable language but hide language button in header line
22
-define('OC_LOCALE_DISABLED', 0);  //  disable language
20
+define('OC_LOCALE_ACTIVE', 2); // enable language and show language button in header line
21
+define('OC_LOCALE_HIDDEN', 1); // enable language but hide language button in header line
22
+define('OC_LOCALE_DISABLED', 0); //  disable language
23 23
 
24 24
 $opt['template']['locales']['DE']['status'] = OC_LOCALE_ACTIVE;
25 25
 $opt['template']['locales']['DE']['flag'] = 'images/flag/DE.png';
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 $opt['locale']['DE']['page']['license'] = '<a rel="license" href="%1"><img alt="Creative Commons Lizenzvertrag" style="border-width:0" src="resource2/ocstyle/images/media/cc-by-nc-nd-small.png" /></a><div style="text-align:center; margin:8px 0 0 6px;">Die <a href="articles.php?page=impressum#datalicense">Inhalte</a> von {site} stehen unter der Creative-Commons-Lizenz <a rel="license" href="%1">BY-NC-ND 3.0 DE</a>.</div>';
132 132
 $opt['locale']['DE']['helpwiki'] = 'http://wiki.opencaching.de/index.php/';
133 133
 $opt['locale']['DE']['mostly_translated'] = true;
134
-$opt['locale']['DE']['what3words'] = true;  // "beta"
134
+$opt['locale']['DE']['what3words'] = true; // "beta"
135 135
 
136 136
 $opt['locale']['IT']['format']['dateshort'] = '%d/%m/%y';
137 137
 $opt['locale']['IT']['format']['dm'] = '%d/%m';
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 $opt['locale']['SV']['page']['subtitle1'] = 'Geocaching med Opencaching';
233 233
 $opt['locale']['SV']['page']['subtitle2'] = '';
234 234
 $opt['locale']['SV']['mostly_translated'] = false;
235
-$opt['locale']['SV']['what3words'] = true;  // "beta"
235
+$opt['locale']['SV']['what3words'] = true; // "beta"
236 236
 
237 237
 $opt['locale']['NO']['format']['dateshort'] = '%d.%m.%y';
238 238
 $opt['locale']['NO']['format']['dm'] = '%d.%m.';
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 $opt['locale']['RU']['format']['colonspace'] = '';
280 280
 $opt['locale']['RU']['country'] = 'RU';
281 281
 $opt['locale']['RU']['mostly_translated'] = false;
282
-$opt['locale']['RU']['what3words'] = true;   // "beta"
282
+$opt['locale']['RU']['what3words'] = true; // "beta"
283 283
 
284 284
 $opt['locale']['DA']['format']['dateshort'] = '%d.%m.%y';
285 285
 $opt['locale']['DA']['format']['dm'] = '%d.%m.';
Please login to merge, or discard this patch.