diff --git a/configs/createdb.php b/configs/createdb.php index bd80be8dc..099b51603 100755 --- a/configs/createdb.php +++ b/configs/createdb.php @@ -153,7 +153,8 @@ $group_model = new GroupModel(DB_NAME, false); $group_model->db = $db; foreach($public_pages as $page_name => $page_content) { $group_model->setPageName(ROOT_ID, PUBLIC_USER_ID, $page_name, - $page_content, "en-US", "Creating Default Page"); + $page_content, "en-US", "Creating Default Pages", + "$page_name Wiki Page Created!", "Discuss the page in this thread!"); } /* we insert 1 by 1 rather than comma separate as sqlite diff --git a/controllers/components/social_component.php b/controllers/components/social_component.php index fc44dc1aa..bc059e3c5 100644 --- a/controllers/components/social_component.php +++ b/controllers/components/social_component.php @@ -797,7 +797,7 @@ class SocialComponent extends Component implements CrawlConstants $page_info = $group_model->getPageInfoByThread($just_thread); if(isset($page_info["PAGE_NAME"])) { $data["WIKI_PAGE_NAME"] = $page_info["PAGE_NAME"]; - $data["WIKI_QUERY"] = "?c={$data['CONTROLLER']}&". + $data["WIKI_QUERY"] = "?c=group&". "a=wiki&arg=edit&page_name=". $page_info['PAGE_NAME']."&locale_tag=". $page_info["LOCALE_TAG"]."&group_id=". diff --git a/controllers/group_controller.php b/controllers/group_controller.php index e2cfc8296..9a322adce 100644 --- a/controllers/group_controller.php +++ b/controllers/group_controller.php @@ -276,7 +276,9 @@ class GroupController extends Controller implements CrawlConstants } else if(!$missing_fields && $page){ $group_model->setPageName($user_id, $group_id, $page_name, $page, - $locale_tag, $edit_reason); + $locale_tag, $edit_reason, + tl('group_controller_page_created', $page_name), + tl('group_controller_page_discuss_here')); $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >". tl("group_controller_page_saved"). diff --git a/locale/ar/configure.ini b/locale/ar/configure.ini index 9a9bd5bd5..95286ea86 100755 --- a/locale/ar/configure.ini +++ b/locale/ar/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "استخدام configs/local_config.php ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "يوب! (ج) 2014" ; footer_element.php line: 83 footer_element_php_search_engine = "بي إتش بي محرك البحث" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "تسجيل الخروج" ; subsearch_element.php line: 71 subsearch_element_more = "أكثر" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "خروج السيارات في دقيقة واحدة!!" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/bn/configure.ini b/locale/bn/configure.ini index aafc4489d..8f752c7fb 100755 --- a/locale/bn/configure.ini +++ b/locale/bn/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/de/configure.ini b/locale/de/configure.ini index 8960dc1d2..e1022174f 100755 --- a/locale/de/configure.ini +++ b/locale/de/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/en-US/configure.ini b/locale/en-US/configure.ini index bc89ec7af..a1bd806e7 100755 --- a/locale/en-US/configure.ini +++ b/locale/en-US/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "Using configs/local_config.php so changin ; group_controller.php line: 273 group_controller_missing_fields = "Missing Fields!" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "%s Wiki Page Created!" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "Discuss the page in this thread!" +; +; group_controller.php line: 283 group_controller_page_saved = "Page Saved!" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "Back" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "Historical Version of %s from %s." ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "Back" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "%s line differences between %s and %s." ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "Revert to %s." ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "Page Reverted!" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "Error Reverting Page!" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "Main" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "(c) 2014 Yioop!" ; footer_element.php line: 83 footer_element_php_search_engine = "PHP Search Engine" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "Edit Page" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "My Group Feeds" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "Recent Group Activity" +; groupfeed_element.php line: 97 +groupfeed_element_back = "My Group Feeds" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "Recent Group Activity" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "%s Wiki Page Discussion" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "%s group thread: %s " ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "Feed" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "Wiki" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "%s User Feed" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "Comment" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "Edit" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "Delete" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = " (%s posts)" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "Comment" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "Add a Comment" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "Start New Thread" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "Subject" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "Post" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "Edit Post" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "Subject" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "Post" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "Save" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "Group Feeds No Longer Updating!" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "Sign Out" ; subsearch_element.php line: 71 subsearch_element_more = "More" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "%s Wiki Page Discussion" +; +; group_view.php line: 93 group_view_feed = "Feed" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "Wiki" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "%s User" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "My Feeds" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "Auto-logout in One Minute!!" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/es/configure.ini b/locale/es/configure.ini index 021d58bd6..3d03e9644 100755 --- a/locale/es/configure.ini +++ b/locale/es/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "Auto-cerrar la sesión en un minuto!" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/fa/configure.ini b/locale/fa/configure.ini index 17b9837b0..03565642b 100755 --- a/locale/fa/configure.ini +++ b/locale/fa/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "از configs/local_config.php استفا ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "(c) 2014 Yioop!" ; footer_element.php line: 83 footer_element_php_search_engine = "موتور جستجو PHP" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "خروج" ; subsearch_element.php line: 71 subsearch_element_more = "بیشتر" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "خروج خودکار تا یک دقیقهٔ دیگر!!" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/fr-FR/configure.ini b/locale/fr-FR/configure.ini index 3f05d656e..539993490 100755 --- a/locale/fr-FR/configure.ini +++ b/locale/fr-FR/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "(c) 2014 Yioop!" ; footer_element.php line: 83 footer_element_php_search_engine = "PHP Moteur de recherche" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "Déconnexion" ; subsearch_element.php line: 71 subsearch_element_more = "Plus" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/he/configure.ini b/locale/he/configure.ini index c2cc1ef0c..1c4374c7a 100755 --- a/locale/he/configure.ini +++ b/locale/he/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/hi/configure.ini b/locale/hi/configure.ini index 89de1c3d8..c5d1e9acb 100755 --- a/locale/hi/configure.ini +++ b/locale/hi/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "साइन आउट करें" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/in-ID/configure.ini b/locale/in-ID/configure.ini index 55bdc1d62..9056a195f 100755 --- a/locale/in-ID/configure.ini +++ b/locale/in-ID/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "Keluar" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/it/configure.ini b/locale/it/configure.ini index 4fa4df123..fea1e0fbf 100755 --- a/locale/it/configure.ini +++ b/locale/it/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "Usando configs/local_config.php la Cartel ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "Motore di Ricerca in PHP" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "Esci" ; subsearch_element.php line: 71 subsearch_element_more = "Più" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "Fine Accesso in un minuto!!" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/ja/configure.ini b/locale/ja/configure.ini index a0e276257..5d2ef39d9 100755 --- a/locale/ja/configure.ini +++ b/locale/ja/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "ログアウト" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "自動なログアウト一分ぐらい" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/kn/configure.ini b/locale/kn/configure.ini index 1a5dd51fe..f19fdc96f 100755 --- a/locale/kn/configure.ini +++ b/locale/kn/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "configs/local_config.php ಉಪಯೋಗ ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "ನಿಷ್ಕ್ರಮಿಸಿ" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/kn/statistics.txt b/locale/kn/statistics.txt index 531e93b98..25dc1f752 100755 --- a/locale/kn/statistics.txt +++ b/locale/kn/statistics.txt @@ -1 +1 @@ -d:9; \ No newline at end of file +d:8; \ No newline at end of file diff --git a/locale/ko/configure.ini b/locale/ko/configure.ini index 0a44c5a02..e46f864e8 100755 --- a/locale/ko/configure.ini +++ b/locale/ko/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "로그 아웃" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "1 분내에 자동 로그 아웃 됍니다." ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/pl/configure.ini b/locale/pl/configure.ini index ccbd99d38..f713a934b 100755 --- a/locale/pl/configure.ini +++ b/locale/pl/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/pt/configure.ini b/locale/pt/configure.ini index 7bc4c8dda..ef6ff81a3 100755 --- a/locale/pt/configure.ini +++ b/locale/pt/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/ru/configure.ini b/locale/ru/configure.ini index e126997a2..b453d9505 100755 --- a/locale/ru/configure.ini +++ b/locale/ru/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/te/configure.ini b/locale/te/configure.ini index 5f4c33aa6..ff4c57584 100755 --- a/locale/te/configure.ini +++ b/locale/te/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "సైన్ ఔట్ " ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/th/configure.ini b/locale/th/configure.ini index 05eed3f01..968fe596c 100755 --- a/locale/th/configure.ini +++ b/locale/th/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/tr/configure.ini b/locale/tr/configure.ini index 722a425d2..f97fc1b5b 100755 --- a/locale/tr/configure.ini +++ b/locale/tr/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/vi-VN/configure.ini b/locale/vi-VN/configure.ini index dae3cd83a..c966a58d8 100755 --- a/locale/vi-VN/configure.ini +++ b/locale/vi-VN/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "Thoát" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "Tự động thoát trong một phút" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/locale/zh-CN/configure.ini b/locale/zh-CN/configure.ini index cad2e04a5..a7226cba8 100755 --- a/locale/zh-CN/configure.ini +++ b/locale/zh-CN/configure.ini @@ -1014,31 +1014,37 @@ system_component_using_local_config = "使用當地語言" ; group_controller.php line: 273 group_controller_missing_fields = "" ; -; group_controller.php line: 281 +; group_controller.php line: 279 +group_controller_page_created = "" +; +; group_controller.php line: 280 +group_controller_page_discuss_here = "" +; +; group_controller.php line: 283 group_controller_page_saved = "" ; -; group_controller.php line: 317 +; group_controller.php line: 319 group_controller_back = "" ; -; group_controller.php line: 318 +; group_controller.php line: 320 group_controller_history_page = "" ; -; group_controller.php line: 351 +; group_controller.php line: 353 group_controller_back = "" ; -; group_controller.php line: 352 +; group_controller.php line: 354 group_controller_diff_page = "" ; -; group_controller.php line: 364 +; group_controller.php line: 366 group_controller_page_revert_to = "" ; -; group_controller.php line: 368 +; group_controller.php line: 370 group_controller_page_reverted = "" ; -; group_controller.php line: 373 +; group_controller.php line: 375 group_controller_revert_error = "" ; -; group_controller.php line: 431 +; group_controller.php line: 433 group_controller_main = "" ; ; machine_controller.php line: 174 @@ -1765,82 +1771,85 @@ footer_element_copyright_yioop = "" ; footer_element.php line: 83 footer_element_php_search_engine = "" ; -; groupfeed_element.php line: 91 +; groupfeed_element.php line: 92 groupfeed_element_wiki_page = "" ; ; groupfeed_element.php line: 94 groupfeed_element_back = "" ; -; groupfeed_element.php line: 103 -groupfeed_element_recent_activity = "" +; groupfeed_element.php line: 97 +groupfeed_element_back = "" ; ; groupfeed_element.php line: 107 +groupfeed_element_recent_activity = "" +; +; groupfeed_element.php line: 111 groupfeed_element_wiki_thread = "" ; -; groupfeed_element.php line: 110 +; groupfeed_element.php line: 114 groupfeed_element_thread = "" ; -; groupfeed_element.php line: 116 +; groupfeed_element.php line: 120 groupfeed_element_feed = "" ; -; groupfeed_element.php line: 120 +; groupfeed_element.php line: 124 group_view_wiki = "" ; -; groupfeed_element.php line: 122 +; groupfeed_element.php line: 126 groupfeed_element_user = "" ; -; groupfeed_element.php line: 149 +; groupfeed_element.php line: 153 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 160 +; groupfeed_element.php line: 164 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 187 +; groupfeed_element.php line: 191 groupfeed_element_edit = "" ; -; groupfeed_element.php line: 192 +; groupfeed_element.php line: 196 groupfeed_element_delete = "" ; -; groupfeed_element.php line: 204 +; groupfeed_element.php line: 208 groupfeed_element_num_posts = "" ; -; groupfeed_element.php line: 228 +; groupfeed_element.php line: 232 groupfeed_element_comment = "" ; -; groupfeed_element.php line: 235 +; groupfeed_element.php line: 239 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 309 +; groupfeed_element.php line: 313 groupfeed_element_add_comment = "" ; -; groupfeed_element.php line: 314 +; groupfeed_element.php line: 318 groupfeed_element_save = "" ; -; groupfeed_element.php line: 341 +; groupfeed_element.php line: 345 groupfeed_element_start_thread = "" ; -; groupfeed_element.php line: 344 +; groupfeed_element.php line: 348 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 350 +; groupfeed_element.php line: 354 groupfeed_element_post = "" ; -; groupfeed_element.php line: 355 +; groupfeed_element.php line: 359 groupfeed_element_save = "" ; -; groupfeed_element.php line: 385 +; groupfeed_element.php line: 389 groupfeed_element_edit_post = "" ; -; groupfeed_element.php line: 388 +; groupfeed_element.php line: 392 groupfeed_element_subject = "" ; -; groupfeed_element.php line: 393 +; groupfeed_element.php line: 397 groupfeed_element_post = "" ; -; groupfeed_element.php line: 399 +; groupfeed_element.php line: 403 groupfeed_element_save = "" ; -; groupfeed_element.php line: 428 +; groupfeed_element.php line: 432 groupfeed_element_no_longer_update = "" ; ; machinelog_element.php line: 61 @@ -2888,19 +2897,22 @@ signin_element_signout = "登出" ; subsearch_element.php line: 71 subsearch_element_more = "" ; -; group_view.php line: 88 +; group_view.php line: 74 +groupfeed_element_wiki_thread = "" +; +; group_view.php line: 93 group_view_feed = "" ; -; group_view.php line: 95 +; group_view.php line: 100 group_view_wiki = "" ; -; group_view.php line: 101 +; group_view.php line: 106 group_view_user = "" ; -; group_view.php line: 108 +; group_view.php line: 113 group_view_myfeeds = "" ; -; group_view.php line: 130 +; group_view.php line: 135 adminview_auto_logout_one_minute = "" ; ; /Applications/MAMP/htdocs/git/yioop//views/helpers diff --git a/models/group_model.php b/models/group_model.php index cd33d9a92..82d20290b 100644 --- a/models/group_model.php +++ b/models/group_model.php @@ -742,7 +742,7 @@ class GroupModel extends Model * */ function setPageName($user_id, $group_id, $page_name, $page, $locale_tag, - $edit_comment = "") + $edit_comment, $thread_title, $tread_description) { $db = $this->db; $pubdate = time(); @@ -753,7 +753,7 @@ class GroupModel extends Model $result = $db->execute($sql, array($parsed_page, $page_id)); } else { $discuss_thread = $this->addGroupItem(0, $group_id, $user_id, - "++".$page_name, "++".$page_name." ".date("r", $pubdate), + $thread_title, $tread_description." ".date("r", $pubdate), WIKI_GROUP_ITEM); $sql = "INSERT INTO GROUP_PAGE (DISCUSS_THREAD, GROUP_ID, TITLE, PAGE, LOCALE_TAG) VALUES (?, ?, ?, ?, ?)"; diff --git a/views/elements/groupfeed_element.php b/views/elements/groupfeed_element.php index 045e58e68..517572421 100644 --- a/views/elements/groupfeed_element.php +++ b/views/elements/groupfeed_element.php @@ -87,12 +87,16 @@ class GroupfeedElement extends Element implements CrawlConstants if($data['SUBTITLE'] != "" && isset($data['ADMIN']) && $data['ADMIN']) { ?> <div class="float-opposite"> - <?php if(isset($data["WIKI_PAGE_NAME"])) { ?> - <a href="<?php e($wiki_query) ?>"><?php - e(tl('groupfeed_element_wiki_page'))?></a> + <?php + if(isset($data["WIKI_PAGE_NAME"])) { ?> + [<a href="<?php e($wiki_query) ?>"><?php + e(tl('groupfeed_element_wiki_page'))?></a>] + [<a href="<?php e($base_query) ?>"><?php + e(tl('groupfeed_element_back'))?></a>] + <?php } else {?> + <a href="<?php e($base_query) ?>"><?php + e(tl('groupfeed_element_back'))?></a> <?php } ?> - <a href="<?php e($base_query) ?>"><?php - e(tl('groupfeed_element_back'))?></a> </div> <?php }