[Isocial-svn] SF.net SVN: isocial: [226]

[<fsn...@us...>]

Revision: 226
          http://isocial.svn.sourceforge.net/isocial/?rev=226&view=rev
Author:   fsnobody
Date:     2008-05-25 07:08:14 -0700 (Sun, 25 May 2008)

Log Message:
-----------
Privacy  for albums + translate

Modified Paths:
--------------
    app/locales/photoapp/album/ru.php
    app/views/photoapp/album/_edit_menu.tpl
    app/views/photoapp/album/_form.tpl
    app/views/photoapp/album/add_photo.tpl
    app/views/photoapp/album/delete.tpl
    app/views/photoapp/album/index.tpl
    app/views/photoapp/album/uploaded.tpl
    app/views/photoapp/album/view.tpl
    timesheet/eerunov.txt

Modified: app/locales/photoapp/album/ru.php
===================================================================
--- app/locales/photoapp/album/ru.php	2008-05-25 13:36:14 UTC (rev 225)
+++ app/locales/photoapp/album/ru.php	2008-05-25 14:08:14 UTC (rev 226)
@@ -6,6 +6,7 @@
 
 $dictionary['My Photos'] = 'Мои Фото';
 $dictionary['Photos'] = 'Фото';
+$dictionary['Add photos'] = 'Добавить фото';
 $dictionary['Photos of You'] = 'Мои личные фото';
 $dictionary['Create a Photo Album'] = 'Создать фото альбом';
 $dictionary['Welcome to PROJECT_NAME Photos'] = 'Добро пожаловать в PROJECT_NAME Фото';
@@ -14,7 +15,14 @@
 $dictionary['Description'] = 'Описание';
 $dictionary['Privacy'] = 'Доступ';
 $dictionary['Create Album'] = 'Создать альбом';
+$dictionary['Save album'] = 'Сохранить альбом';
+$dictionary['Update'] = 'Обновить';
+$dictionary['Edit'] = 'Радактировать';
+$dictionary['Cover'] = 'Обложка';
+$dictionary['Back'] = 'Вернуться';
+$dictionary['may be not empty. Delete it with photos?'] = 'может быть не пуст. Удалить с фото?';
 
+
 $dictionary['My Albums'] = 'Мои альбомы';
 $dictionary['Create a New Album'] = 'Создать новый альбом';
 $dictionary['You have no any album'] = 'У вас нет альбомов';
@@ -23,12 +31,18 @@
 $dictionary['Description'] = 'Описание';
 $dictionary['Created'] = 'Создан';
 $dictionary['Edit Album'] = 'Редактировать альбом';
+$dictionary['Edit info'] = 'Редактировать данные';
+
+$dictionary['Edit uploaded'] = 'Загруженные';
 $dictionary['View Album'] = 'Просмотреть альбом';
+$dictionary['View'] = 'Просмотр';
 $dictionary['Delete Album'] = 'Удалить альбом';
+$dictionary['Delete'] = 'Удалить';
 $dictionary['photos'] = 'фотографий';
 $dictionary['Upload'] = 'Загрузить';
 $dictionary['Choose'] = 'Обзор';
 $dictionary['Uploaded'] = 'Загруженные';
+$dictionary['No cover choosed'] = 'Обложка не выбранна';
 
 
 

Modified: app/views/photoapp/album/_edit_menu.tpl
===================================================================
--- app/views/photoapp/album/_edit_menu.tpl	2008-05-25 13:36:14 UTC (rev 225)
+++ app/views/photoapp/album/_edit_menu.tpl	2008-05-25 14:08:14 UTC (rev 226)
@@ -1,15 +1,15 @@
 <div class="tabs">
   <div class="left">
     <ul class="toggle_tabs">
-      <li class="first"><a href="/photoapp/album/add_photo/<?= $album->getId()?>" class="<?= $controller->getActionName() == 'add_photo' ? 'selected' : '' ?>">_{Add Photos}</a></li><?
+      <li class="first"><a href="/photoapp/album/add_photo/<?= $album->getId()?>" class="<?= $controller->getActionName() == 'add_photo' ? 'selected' : '' ?>">_{Add photos}</a></li><?
       ?><li class="first"><a href="/photoapp/album/view/<?= $album->getId()?>" class="<?= in_array($controller->getActionName(),array( 'edit_photo', 'view')) ? 'selected' : '' ?>">_{View}</a></li><?
       ?><li class="first"><a href="/photoapp/album/uploaded/<?= $album->getId()?>" class="<?= $controller->getActionName() == 'uploaded' ? 'selected' : '' ?>">_{Edit uploaded}</a></li><?
-      ?><li><a href="/photoapp/album/edit/<?= $album->getId()?>" class="last <?= $controller->getActionName() == 'edit' ? 'selected' : '' ?>">_{Edit Info}</a></li><?
+      ?><li><a href="/photoapp/album/edit/<?= $album->getId()?>" class="last <?= $controller->getActionName() == 'edit' ? 'selected' : '' ?>">_{Edit info}</a></li><?
       ?><li><a href="/photoapp/album/delete/<?= $album->getId()?>" class="last <?= $controller->getActionName() == 'delete' ? 'selected' : '' ?>">_{Delete}</a></li>
     </ul>
   </div>
   <div class="right">
-      <a href="/photoapp" class="<?= $controller->getActionName() == 'help' ? 'selected' : '' ?>">_{Back to Album}</a>
+      <a href="/photoapp" class="<?= $controller->getActionName() == 'help' ? 'selected' : '' ?>">_{Back}</a>
   </div>
 </div>
 <div class="clearfix">&nbsp;</div>

Modified: app/views/photoapp/album/_form.tpl
===================================================================
--- app/views/photoapp/album/_form.tpl	2008-05-25 13:36:14 UTC (rev 225)
+++ app/views/photoapp/album/_form.tpl	2008-05-25 14:08:14 UTC (rev 226)
@@ -19,12 +19,7 @@
         <div class="form_create_row">
             <label >_{Privacy}:</label>
             <div class="form_create_col">
-                <select>
-                    <option>Everyone</option>
-                    <option>Friends of Friends</option>
-                    <option>Only Friends</option>
-                    <option>Customize...</option>
-                </select>
+                    <?= $access_field_helper->access_field('album', 'privacy', array('title' => 'Privacy')); ?>
             </div>
         </div>
         <div class="clearfix"></div>
@@ -32,7 +27,7 @@
         <div class="form_create_row">
             <label >&nbsp;</label>
             <div class="form_create_col">
-                <input class="submitinput" type="submit" value="_{Create Album}"/>
+                <input class="submitinput" type="submit" value="_{Save album}"/>
             </div>
         </div>
         <div class="clearfix"></div>

Modified: app/views/photoapp/album/add_photo.tpl
===================================================================
--- app/views/photoapp/album/add_photo.tpl	2008-05-25 13:36:14 UTC (rev 225)
+++ app/views/photoapp/album/add_photo.tpl	2008-05-25 14:08:14 UTC (rev 226)
@@ -51,7 +51,7 @@
         <div class="clearfix"></div>
 
         <div class="form_row">
-            <small>You can upload JPG, GIF or PNG files.</small>
+            <small>You can upload JPG files.</small>
         </div>
         <div class="clearfix"></div>
 
@@ -68,7 +68,6 @@
             <label >&nbsp;</label>
             <div class="form_create_col">
                 <input class="submitinput" type="submit" value="_{Upload}"/>
-                <input class="cancelinput" type="button" value="_{Cancel}"/>
             </div>
         </div>
         <div class="clearfix"></div>

Modified: app/views/photoapp/album/delete.tpl
===================================================================
--- app/views/photoapp/album/delete.tpl	2008-05-25 13:36:14 UTC (rev 225)
+++ app/views/photoapp/album/delete.tpl	2008-05-25 14:08:14 UTC (rev 226)
@@ -14,11 +14,10 @@
                 _{Delete Photo Album}?
             </div>
             <div class="text">
-                {album.name?} is empty. Delete it?
+                {album.name?} _{may be not empty. Delete it with photos?}
             </div>
             <div class="formbtns">
                 <input class="submitinput" type="submit" value="_{Delete Album}"/>
-                <input class="cancelinput" type="button" value="_{Cancel}"/>
             </div>
         </div>
         </form>

Modified: app/views/photoapp/album/index.tpl
===================================================================
--- app/views/photoapp/album/index.tpl	2008-05-25 13:36:14 UTC (rev 225)
+++ app/views/photoapp/album/index.tpl	2008-05-25 14:08:14 UTC (rev 226)
@@ -27,7 +27,7 @@
     {loop my_albums}
     <div class="album">
         <div class="img"><? if ($my_album->get('img') != '' || $my_album->get('img')) {?><img src="/preview/index/100x100/<?= $my_album->get('img')?>" /><? 
-            } else {?>No Cover choosed<? 
+            } else {?>_{No cover choosed}<? 
             }
       ?></div>
         <div class="info">

Modified: app/views/photoapp/album/uploaded.tpl
===================================================================
--- app/views/photoapp/album/uploaded.tpl	2008-05-25 13:36:14 UTC (rev 225)
+++ app/views/photoapp/album/uploaded.tpl	2008-05-25 14:08:14 UTC (rev 226)
@@ -45,7 +45,7 @@
                 <div class="form_create_row">
                     <label class="medium">&nbsp;</label>
                     <div class="form_create_col">
-                        <input class="submitinput" type="submit" value="_{Update Info}"/>
+                        <input class="submitinput" type="submit" value="_{Update}"/>
                     </div>
                 </div>
                 <div class="clearfix"></div>

Modified: app/views/photoapp/album/view.tpl
===================================================================
--- app/views/photoapp/album/view.tpl	2008-05-25 13:36:14 UTC (rev 225)
+++ app/views/photoapp/album/view.tpl	2008-05-25 14:08:14 UTC (rev 226)
@@ -21,8 +21,8 @@
             </div>
             <div class="links">
                 <ul class="actions_list">
-                    <li><a href="/photoapp/album/edit_photo/<?= $photo->getId()?>">_{Edit Photo}</a></li>
-                    <li><a href="/photoapp/album/delete_photo/<?= $photo->getId()?>">_{Delete Photo}</a></li>
+                    <li><a href="/photoapp/album/edit_photo/<?= $photo->getId()?>">_{Edit}</a></li>
+                    <li><a href="/photoapp/album/delete_photo/<?= $photo->getId()?>">_{Delete}</a></li>
                     <li><a href="/photoapp/album/set_cover/<?= $photo->getId()?>">_{Cover}</a></li>
                 </ul>
             </div>

Modified: timesheet/eerunov.txt
===================================================================
--- timesheet/eerunov.txt	2008-05-25 13:36:14 UTC (rev 225)
+++ timesheet/eerunov.txt	2008-05-25 14:08:14 UTC (rev 226)
@@ -16,5 +16,5 @@
 2008-05-20,18:00,19:00,photoapp,RT:2,"edit photo - save cover to album,trouble in destroyPhoto when it is cover"
 2008-05-21,18:30,21:20,photoapp,RT:2,"cover + triggers for photos_count in album"
 2008-05-23,17:00,18:30,phoyoapp,RT:2,"remove is_cover in model"
-2008-05-25,11:00,13:30.photoapp,RT:2,"album paginator"
+2008-05-25,11:00,17:00.photoapp,RT:2,"album paginator"
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.