From c9ac428ede0a5d9c0a81d8c09ccb2055787a4520 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Mon, 31 Jan 2022 02:30:15 +0300 Subject: [PATCH 01/38] Groups: Update groups layot --- Web/Presenters/templates/@listView.xml | 11 +- Web/Presenters/templates/User/Groups.xml | 39 +- Web/Presenters/templates/components/error.xml | 15 +- Web/static/css/style.css | 23 +- locales/LICENSE | 504 ++++++++++++++++++ locales/crowdin.yml | 3 + locales/ru.strings | 6 + 7 files changed, 584 insertions(+), 17 deletions(-) create mode 100644 locales/LICENSE create mode 100644 locales/crowdin.yml diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index 35c9a2f0..e575a4a8 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -5,7 +5,11 @@
{include tabs}
- + + {ifset size} + {include size, x => $dat} + {/ifset} +
{var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} @@ -54,5 +58,10 @@ {/ifset} {/if}
+ + {ifset bottom} + {include bottom} + {/ifset} + {/block} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 18860fd8..1ad47c8d 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -5,16 +5,12 @@ {block title}{_"groups"}{/block} {block header} +{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} + {_my_groups} + {else} {$user->getCanonicalName()} » {_"groups"} - + {/if}
- - - - {_"create_group"} - - -
{/block} @@ -35,6 +31,12 @@ {/if} {/block} +{block size} +
+
Найдено групп ({$thisUser->getClubCount()})
+
+{/block} + {block link|strip|stripHtml} {$x->getURL()} {/block} @@ -63,3 +65,24 @@ {/if} {/block} + +{block bottom} +{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} +
+
+

{_"open_new_group"}

+ {_"open_group_desc"} +
+
+ +
+

{_"search_group"}

+ {_"search_group_desc"} +
+ + + +
+
+{/if} +{/block} diff --git a/Web/Presenters/templates/components/error.xml b/Web/Presenters/templates/components/error.xml index 288129a2..1e3568d9 100644 --- a/Web/Presenters/templates/components/error.xml +++ b/Web/Presenters/templates/components/error.xml @@ -1,7 +1,8 @@ -
- Ошибка -

{$title}

-

- {$description} -

-
+
+ + {$title} +
+
+ {$description} + +
\ No newline at end of file diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 590a62d6..a15a305a 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1830,4 +1830,25 @@ body.scrolled .toTop:hover { .comments_count { padding: 5px 0px 0px 0px; -} \ No newline at end of file +} + +.groups_options { + padding: 10px 20px 20px; + border-top: #DEDEDE solid 1px; + margin-top: 12px; + margin-left: -12px; + margin-right: -12px; + } + + #gp_container { + display: inline-block; + } + + #gp_container span { + display: block; + margin: 10px 0 15px; + } + + #gp_container h4 { + font-size: 11px; + } \ No newline at end of file diff --git a/locales/LICENSE b/locales/LICENSE new file mode 100644 index 00000000..8000a6fa --- /dev/null +++ b/locales/LICENSE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random + Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/locales/crowdin.yml b/locales/crowdin.yml new file mode 100644 index 00000000..4fe6e093 --- /dev/null +++ b/locales/crowdin.yml @@ -0,0 +1,3 @@ +files: + - source: /ru.strings + translation: /%two_letters_code%.strings diff --git a/locales/ru.strings b/locales/ru.strings index a283fe35..6c14252d 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -285,6 +285,12 @@ "meetings_many" = "$1 встреч"; "meetings_other" = "$1 встреч"; +"open_new_group" = "Открыть новую группу"; +"open_group_desc" = "Не можете найти нужную группу? Откройте свою..."; +"search_group" = "Поиск группы"; +"search_by_groups" = "Поиск по группам"; +"search_group_desc" = "Здесь Вы можете просмотреть существующие группы и выбрать группу себе по вкусу..."; + /* Albums */ "create" = "Создать"; From f7beeb3e2bef91e6f316df338f133594844e4c41 Mon Sep 17 00:00:00 2001 From: Vladimir Barinov Date: Mon, 31 Jan 2022 02:49:15 +0300 Subject: [PATCH 02/38] We don't use crowdin anymore, why it's still there? --- locales/crowdin.yml | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 locales/crowdin.yml diff --git a/locales/crowdin.yml b/locales/crowdin.yml deleted file mode 100644 index 4fe6e093..00000000 --- a/locales/crowdin.yml +++ /dev/null @@ -1,3 +0,0 @@ -files: - - source: /ru.strings - translation: /%two_letters_code%.strings From 1f0913c460d5edc1d40fa3d1ed77af2e46893b1c Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 31 Jan 2022 04:28:20 +0300 Subject: [PATCH 03/38] Locales: Delete unnecessary LICENSE We already have COPYING in the root directory :/ --- locales/LICENSE | 504 ------------------------------------------------ 1 file changed, 504 deletions(-) delete mode 100644 locales/LICENSE diff --git a/locales/LICENSE b/locales/LICENSE deleted file mode 100644 index 8000a6fa..00000000 --- a/locales/LICENSE +++ /dev/null @@ -1,504 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random - Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! From 7dea746dfaaf1f91899f884bdec1503cc462ec48 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 31 Jan 2022 04:34:16 +0300 Subject: [PATCH 04/38] Locales: Localize strings for updated group layout Localized strings: open_new_group, open_group_desc, search_group, search_by_groups, search_group_desc (we already have search_for_groups but idk, I'll leave it for now) --- locales/en.strings | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/locales/en.strings b/locales/en.strings index 7ef546da..bc5212d0 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -269,6 +269,12 @@ "meetings_one" = "$1 meeting"; "meetings_other" = "$1 meetings"; +"open_new_group" = "Open a new group"; +"open_group_desc" = "Can't find the right group? Open your own..."; +"search_group" = "Search group"; +"search_by_groups" = "Search by groups"; +"search_group_desc" = "Here you can browse through the existing groups and choose a group to suit your needs..."; + /* Albums */ "create" = "Create"; From 77bda53ad94a4529f390722e69c4e91c42195639 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 31 Jan 2022 04:45:12 +0300 Subject: [PATCH 05/38] Global: Fix tabs --- Web/Presenters/templates/@listView.xml | 11 +++++------ Web/Presenters/templates/components/error.xml | 6 ++---- Web/static/css/style.css | 14 +++++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index e575a4a8..b3a0a314 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -7,12 +7,12 @@ {ifset size} - {include size, x => $dat} + {include size, x => $dat} {/ifset}
{var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} - + {if sizeof($data) > 0}
@@ -30,7 +30,7 @@
- + {include description, x => $dat}
@@ -40,7 +40,7 @@
- +
{include "components/paginator.xml", conf => (object) [ "page" => $page, @@ -60,8 +60,7 @@
{ifset bottom} - {include bottom} + {include bottom} {/ifset} -
{/block} diff --git a/Web/Presenters/templates/components/error.xml b/Web/Presenters/templates/components/error.xml index 1e3568d9..9ce715db 100644 --- a/Web/Presenters/templates/components/error.xml +++ b/Web/Presenters/templates/components/error.xml @@ -1,8 +1,6 @@
- {$title} -
-
- {$description} + {$title}

+ {$description}
\ No newline at end of file diff --git a/Web/static/css/style.css b/Web/static/css/style.css index a15a305a..ce0b3543 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1838,17 +1838,17 @@ body.scrolled .toTop:hover { margin-top: 12px; margin-left: -12px; margin-right: -12px; - } +} - #gp_container { +#gp_container { display: inline-block; - } +} - #gp_container span { +#gp_container span { display: block; margin: 10px 0 15px; - } +} - #gp_container h4 { +#gp_container h4 { font-size: 11px; - } \ No newline at end of file +} From 42f862eaec70302f3f8fef2f35a5caf875c2f476 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Mon, 31 Jan 2022 04:45:56 +0300 Subject: [PATCH 06/38] Groups: Fix tabs and div block I have SO many questions... --- Web/Presenters/templates/User/Groups.xml | 78 ++++++++++++------------ 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 1ad47c8d..8991c0a9 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -2,39 +2,39 @@ {var iterator = $user->getClubs($page, $admin)} {var count = $user->getClubCount($admin)} -{block title}{_"groups"}{/block} +{block title} + {_groups} +{/block} {block header} -{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} - {_my_groups} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} + {_my_groups} {else} - {$user->getCanonicalName()} » {_"groups"} + {$user->getCanonicalName()} » {_groups} {/if} -
-
{/block} {* BEGIN ELEMENTS DESCRIPTION *} {block tabs} - {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} -
- - {_groups} - -
-
- - {_managed} - -
- {/if} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} +
+ + {_groups} + +
+
+ + {_managed} + +
+ {/if} {/block} {block size} -
+
Найдено групп ({$thisUser->getClubCount()})
-
+
{/block} {block link|strip|stripHtml} @@ -67,22 +67,24 @@ {/block} {block bottom} -{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} -
-
-

{_"open_new_group"}

- {_"open_group_desc"} -
-
- -
-

{_"search_group"}

- {_"search_group_desc"} -
- - - -
-
-{/if} + {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} +
+
+

{_open_new_group}

+ {_open_group_desc} +
+ +
+
+
+

{_search_group}

+ {_search_group_desc} +
+ + + +
+
+
+ {/if} {/block} From a2b13116e6b4a89c199bd1cf7cc68e6c6acc923d Mon Sep 17 00:00:00 2001 From: kosfurler Date: Mon, 31 Jan 2022 15:15:51 +0300 Subject: [PATCH 07/38] Groups: Update layot New counter, info and actions blocks and some stye fixes --- Web/Presenters/templates/@listView.xml | 12 +++--- Web/Presenters/templates/User/Groups.xml | 39 ++++++++++++++++--- .../templates/components/paginator.xml | 24 ++++++------ Web/static/css/style.css | 13 +++++++ locales/ru.strings | 5 +++ 5 files changed, 71 insertions(+), 22 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index b3a0a314..aab6660e 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -24,24 +24,25 @@ + {ifset infotable} + {include infotable, x => $dat} + {else} {include name, x => $dat}
- - {include description, x => $dat} + {include description, x => $dat} + {/ifset} - + {include actions, x => $dat} - -
{include "components/paginator.xml", conf => (object) [ "page" => $page, "count" => $count, @@ -49,7 +50,6 @@ "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, "atBottom" => true, ]} -
{else} {ifset customErrorMessage} {include customErrorMessage} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 8991c0a9..5b8c3a74 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -33,7 +33,13 @@ {block size}
-
Найдено групп ({$thisUser->getClubCount()})
+
+ {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} + {tr("groups_list", $thisUser->getClubCount())} + {else} + {tr("groups", $user->getClubCount())} + {/if} +
{/block} @@ -45,8 +51,19 @@ Фотография группы {/block} -{block name} - {$x->getName()} +{block infotable} + + + + + + + + + + + +
Название: {$x->getName()}
Размер:{tr("participants", $x->getFollowersCount())}
{/block} {block description} @@ -56,13 +73,25 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} {if $x->canBeModifiedBy($thisUser ?? NULL) && ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} - + + {_check_community} + + + {if $clubPinned} {_remove_from_left_menu} {else} {_add_to_left_menu} {/if} + +
+ + + + +
+ {/if} {/block} @@ -87,4 +116,4 @@ {/if} -{/block} +{/block} \ No newline at end of file diff --git a/Web/Presenters/templates/components/paginator.xml b/Web/Presenters/templates/components/paginator.xml index cf717e23..7c14e7e4 100644 --- a/Web/Presenters/templates/components/paginator.xml +++ b/Web/Presenters/templates/components/paginator.xml @@ -1,16 +1,18 @@ {var $space = 2} {var $pageCount = ceil($conf->count / $conf->perPage)} -
- {if $conf->page > $space} - « - {/if} - {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++} - {if $j > 0 && $j <= $pageCount} - {$j} +
+
+ {if $conf->page > $space} + « {/if} - {/for} - {if $conf->page <= $pageCount-$space} - » - {/if} + {for $j = $conf->page - ($space-1); $j <= $conf->page + ($space-1); $j++} + {if $j > 0 && $j <= $pageCount} + {$j} + {/if} + {/for} + {if $conf->page <= $pageCount-$space} + » + {/if} +
diff --git a/Web/static/css/style.css b/Web/static/css/style.css index ce0b3543..6ab60b75 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1852,3 +1852,16 @@ body.scrolled .toTop:hover { #gp_container h4 { font-size: 11px; } + +.container_gray .content:last-child { + margin-bottom: 0; + } + +.group_info { + padding: 0 0 0 5px !important; + } + +.group_info .label { + width: auto !important; + padding-right: 5px; +} \ No newline at end of file diff --git a/locales/ru.strings b/locales/ru.strings index 6c14252d..b21acfed 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -225,6 +225,7 @@ "subscriptions" = "Подписки"; "join_community" = "Вступить в группу"; "leave_community" = "Выйти из группы"; +"check_community" = "Просмотр группы"; "min_6_community" = "Название должно быть не менее 6 символов"; "participants" = "Участники"; "groups" = "Группы"; @@ -279,6 +280,10 @@ "groups_many" = "$1 групп"; "groups_other" = "$1 групп"; +"groups_list_zero" = "Вы не состоите ни в одной группе"; +"groups_list_one" = "Вы состоите в одной группе"; +"groups_list_other" = "Вы состоите в $1 группах"; + "meetings_zero" = "Ни одной встречи"; "meetings_one" = "Одна встреча"; "meetings_few" = "$1 встречи"; From 3f1b852e506be13827d24a75803e1cadfd843d68 Mon Sep 17 00:00:00 2001 From: kosfurler Date: Tue, 1 Feb 2022 19:50:53 +0300 Subject: [PATCH 08/38] Layout: Made a brand new layout for notes list and update counter in video list --- Web/Presenters/templates/@listView.xml | 96 ++++++++++++------------ Web/Presenters/templates/Notes/List.xml | 95 ++++++++++++++++++----- Web/Presenters/templates/Videos/List.xml | 14 +++- Web/static/css/style.css | 13 +++- locales/en.strings | 1 + locales/ru.strings | 11 ++- 6 files changed, 161 insertions(+), 69 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index aab6660e..839283b9 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -10,54 +10,58 @@ {include size, x => $dat} {/ifset} -
- {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} + {ifset specpage} + {include specpage, x => $dat} + {else} +
+ {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} - {if sizeof($data) > 0} -
- - - - - - - - -
- - {include preview, x => $dat} - - - {ifset infotable} - {include infotable, x => $dat} - {else} - - - {include name, x => $dat} - - -
- {include description, x => $dat} - {/ifset} - 		- {include actions, x => $dat} -
-
- {include "components/paginator.xml", conf => (object) [ - "page" => $page, - "count" => $count, - "amount" => sizeof($data), - "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, - "atBottom" => true, - ]} - {else} - {ifset customErrorMessage} - {include customErrorMessage} + {if sizeof($data) > 0} +
+ + + + + + + + +
+ + {include preview, x => $dat} + + + {ifset infotable} + {include infotable, x => $dat} + {else} + + + {include name, x => $dat} + + +
+ {include description, x => $dat} + {/ifset} + 		+ {include actions, x => $dat} +
+
+ {include "components/paginator.xml", conf => (object) [ + "page" => $page, + "count" => $count, + "amount" => sizeof($data), + "perPage" => $perPage ?? OPENVK_DEFAULT_PER_PAGE, + "atBottom" => true, + ]} {else} - {include "components/nothing.xml"} - {/ifset} - {/if} -
+ {ifset customErrorMessage} + {include customErrorMessage} + {else} + {include "components/nothing.xml"} + {/ifset} + {/if} +
+ {/ifset} {ifset bottom} {include bottom} diff --git a/Web/Presenters/templates/Notes/List.xml b/Web/Presenters/templates/Notes/List.xml index 44d831f5..2fb31c0c 100644 --- a/Web/Presenters/templates/Notes/List.xml +++ b/Web/Presenters/templates/Notes/List.xml @@ -5,12 +5,25 @@ {block title}{_notes}{/block} {block header} - {$owner->getCanonicalName()} - » - {_notes} - -
- {_create_note} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + {_my_notes} + {else} + + {$owner->getCanonicalName()} + » + {_notes} + {/if} +{/block} + +{block size} +
+
+ {tr("notes_list", $count)} + +  |  + {_create_note} + +
{/block} @@ -20,18 +33,66 @@ {* BEGIN ELEMENTS DESCRIPTION *} -{block link|strip|stripHtml} - /note{$x->getPrettyId()} -{/block} +{block specpage} +
-{block preview} -
{_note}
-{/block} + {var data = is_array($iterator) ? $iterator : iterator_to_array($iterator)} + {if sizeof($data) > 0} -{block name} - {$x->getName()} -{/block} +
+
+ + + +
+ +
+ + {else} + {if isset($thisUser) && $thisUser->getId() == $owner->getId()} + +

{_welcome}

{_notes_start_screen}
+ + {else} + {ifset customErrorMessage} + {include ../customErrorMessage} + {else} + {include ../components/nothing.xml} + {/ifset} + {/if} + {/if} +
{/block} diff --git a/Web/Presenters/templates/Videos/List.xml b/Web/Presenters/templates/Videos/List.xml index 0f04b482..be9e3cad 100644 --- a/Web/Presenters/templates/Videos/List.xml +++ b/Web/Presenters/templates/Videos/List.xml @@ -8,9 +8,17 @@ {block header} {$user->getCanonicalName()} » {_"videos"} - -
- {_"upload_video"} +{/block} + +{block size} +
+
+ {tr("videos", $count)} + +  |  + {_upload_video} + +
{/block} diff --git a/Web/static/css/style.css b/Web/static/css/style.css index 6ab60b75..5473d1d6 100644 --- a/Web/static/css/style.css +++ b/Web/static/css/style.css @@ -1864,4 +1864,15 @@ body.scrolled .toTop:hover { .group_info .label { width: auto !important; padding-right: 5px; -} \ No newline at end of file +} + +table td[width="120"] { + text-align: right; +} + +.profile_thumb { + padding: 0px 10px 0px 0px; + width: 50px; + display: inline-block; + vertical-align: top; +} diff --git a/locales/en.strings b/locales/en.strings index bc5212d0..35c74464 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -310,6 +310,7 @@ "notes_zero" = "No notes"; "notes_one" = "$1 note"; "notes_other" = "$1 notes"; +"notes_start_screen" = "With notes, you can share your events with friends and see what's going on with them."; /* Menus */ diff --git a/locales/ru.strings b/locales/ru.strings index b21acfed..9fc20c03 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -324,9 +324,10 @@ "note" = "Заметка"; "name_note" = "Название"; "text_note" = "Содержание"; -"create_note" = "Создать заметку"; +"create_note" = "Добавить запись"; "edit_note" = "Редактировать заметку"; "actions" = "Действия"; +"notes_start_screen" = "С помощью заметок Вы можете делиться событиями из жизни с друзьями, а так же быть в курсе того, что происходит у них."; "edited" = "Отредактировано"; @@ -336,6 +337,12 @@ "notes_many" = "$1 заметок"; "notes_other" = "$1 заметок"; +"notes_list_zero" = "Не найдено ни одной заметки"; +"notes_list_one" = "Найдена одна заметка"; +"notes_list_few" = "Найдено $1 заметки"; +"notes_list_many" = "Найдено $1 заметок"; +"notes_list_other" = "Найдено $1 заметок"; + /* Menus */ "edit_button" = "ред."; @@ -502,7 +509,7 @@ "info_uploaded_by" = "Загрузил"; "info_upload_date" = "Дата загрузки"; -"videos_zero" = "Ни одной видеозаписи"; +"videos_zero" = "Нет видео"; "videos_one" = "Одна видеозапись"; "videos_few" = "$1 видеозаписи"; "videos_many" = "$1 видеозаписей"; From c911ebac258d33d7f3c51cdfcbc82e2fbe5739aa Mon Sep 17 00:00:00 2001 From: kosfurler Date: Tue, 1 Feb 2022 21:35:37 +0300 Subject: [PATCH 09/38] Groups: Fix action block issue --- Web/Presenters/templates/User/Groups.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 5b8c3a74..daf20087 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -72,19 +72,19 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} - {if $x->canBeModifiedBy($thisUser ?? NULL) && ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} + {if $x->canBeModifiedBy($thisUser ?? NULL)} {_check_community} - - - {if $clubPinned} - {_remove_from_left_menu} - {else} - {_add_to_left_menu} - {/if} - - + {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} + + {if $clubPinned} + {_remove_from_left_menu} + {else} + {_add_to_left_menu} + {/if} + + {/if}
From 2cf8a307846dbb7d3738ca5f920e8bace03cda1c Mon Sep 17 00:00:00 2001 From: ayaao <58212796+ayaaop@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:33:52 +0600 Subject: [PATCH 10/38] L10n: Kazakh: Add missing new strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit с прошедшим новым годом cca9151661b0c0e341a0c9d54123d01203fee6df 1b1c88dd96dd8beeec0aff971f119658ebe3f37d 3edf34e0ea3a88db393675d745fdccaa1c81ccb1 70dd7e377306076cbe474b7d74d030348ff4f140 bf81402174006732d1ff62a201e669346f8d4b46 870653ccb1b5c7e21753926afb5e7a5466e4a3f0 d87277e7e74d465a73659ffb94b4e99c59c87a56 1df0545061acdbb476ffea0d342defa537ae6f74 5bad3dbd355fcdc2ea7b410a1e85c633d965f215 b1407ba823f72a3b11ec32f80388baed6152bce7 b7654c8d16b95fd4daf9a5889072e5406395a62e --- locales/kk.strings | 60 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/locales/kk.strings b/locales/kk.strings index 4a985071..a90bbba4 100644 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -9,6 +9,8 @@ "home" = "Басты бет"; "welcome" = "Қош келдіңіз!"; +"to_top" = "Жоғарыға"; + /* Login */ "log_in" = "Логин"; @@ -36,6 +38,13 @@ "password_reset_error" = "Құпиясөзді қалпына келтіру кезінде күтпеген қате орын алды."; "password_reset_rate_limit_error" = "Кешіріңіз, бірақ осы әрекетті сонай жиі жасай алмайсыз."; +"email_sent" = "Хат сәтті жіберілді."; +"email_sent_desc" = "Сіз енгізген электрондық пошта бар болса оған нұсқаулар келеді."; +"email_error" = "Электрондық хатты жіберу кезінде күтпеген қате орын алды."; +"email_rate_limit_error" = "Бұл әрекетті жиі жасай алмайсыз."; + +"email_verify_success" = "Электрондық поштаңыз расталды. Осы әлеуметтік желіде жақсы уақыт өткізуді тілейміз!"; + "registration_disabled_info" = "Жүйе әкімшісі тіркеуді өшірді. Мүмкіндігінше, егер досыңыз сайтта тіркелген болса одан шақыру сілтемесін сұраңыз."; "registration_closed" = "Тіркелу жабық"; "invites_you_to" = "$1 сізді $2 желіне шақырады."; @@ -216,6 +225,7 @@ "subscriptions" = "Жазылымдар"; "join_community" = "Топқа кіру"; "leave_community" = "Топтан шығу"; +"check_community" = "Топты қарау"; "min_6_community" = "Топтың аты тым болмаса 6 әріптен көп болу керек"; "participants" = "Қатысушылар"; "groups" = "Топтар"; @@ -232,6 +242,8 @@ "all_followers" = "Барлық жазылмандар"; "only_administrators" = "Тек әкімшілер"; "website" = "Сайт"; +"managed" = "Басқаратын"; +"size" = "Көлемі"; "administrators_one" = "$1 әкімші"; "administrators_other" = "$1 әкімші"; @@ -245,6 +257,7 @@ "hidden_yes" = "Жасырылған: Ия"; "hidden_no" = "Жасырылған: Жоқ"; "group_allow_post_for_everyone" = "Бәріне жазба жазуға рұқсат ету"; +"group_hide_from_global_feed" = "Жаһандық арнада жазбаларды көрсетпеу"; "statistics" = "Статистика"; "group_administrators_list" = "Әкімшілер тізімі"; "group_display_only_creator" = "Тек топты құрған кісіні көрсету"; @@ -263,10 +276,20 @@ "groups_one" = "$1 топ"; "groups_other" = "$1 топ"; +"groups_list_zero" = "Сіз ешқандай топқа қатыспайсыз."; +"groups_list_one" = "Сіз бір топқа қатысасыз"; +"groups_list_other" = "Сіз $1 топтардың қатысушысысыз"; + "meetings_zero" = "Кездесулер жоқ"; "meetings_one" = "$1 кездесу"; "meetings_other" = "$1 кездесу"; +"open_new_group" = "Жаңа топ ашу"; +"open_group_desc" = "Өзіңізге сай топ таба алмай жүрсіз бе? Өзіңіз ашып алыңыз!"; +"search_group" = "Топ іздеу"; +"search_by_groups" = "Топтардан іздеу"; +"search_group_desc" = "Мұнда сіз бар топтарға шолу жасай аласыз және қажеттіліктеріңізге сай топты таңдай аласыз..."; + /* Albums */ "create" = "Жасау"; @@ -294,10 +317,13 @@ "name_note" = "Тақырыбы"; "text_note" = "Мазмұны"; "create_note" = "Жолжазба жазу"; +"edit_note" = "Жолжазбаны өндеу"; "actions" = "Әрекеттер"; "feed" = "Жаңалықтар"; "publish_post" = "Жазба қосу"; +"edited" = "Өнделген"; + "notes_zero" = "Жолжазбалар жоқ"; "notes_one" = "$1 жолжазба"; "notes_other" = "$1 жолжазба"; @@ -337,6 +363,7 @@ "left_menu_donate" = "Қайырымдылық жасау"; +"footer_about_instance" = "инстанция туралы"; "footer_blog" = "блог"; "footer_help" = "көмек"; "footer_developers" = "әзірлеушілерге"; @@ -367,6 +394,8 @@ "cut" = "Кесілген"; "round_avatars" = "Дөңгелектелген"; +"apply_style_for_this_device" = "Стильді тек осы девайс үшін қосу"; + "search_for_groups" = "Топтар іздеу"; "search_for_people" = "Кісілер іздеу"; "search_button" = "Іздеу"; @@ -391,6 +420,7 @@ "ui_settings_rating_hide" = "Жасыру"; "additional_links" = "Қосымша сілтемелер"; +"ad_poster" = "Жарнама постері"; "two_factor_authentication" = "Екі факторлы аутентификация"; "two_factor_authentication_disabled" = "Бұзылудан сенімді қорғаныс қызметін қамтамасыз етеді: парақшаға кіру үшін 2FA қосымшасында алынған кодты енгізу керек."; @@ -637,6 +667,14 @@ "banned_2" = "Мұның себебі қарапайым: $1. Өкінішке орай, осы жолы сізді мәңгілікке блоктауға мәжбүр болдық."; "banned_3" = "Егер сізді қателесіп блоктады деп ойласаңыз, қолдау қызметіне жаза аласыз немесе жүйеден шыға аласыз."; +/* Registration confirm */ + +"ec_header" = "Тіркеуді растау"; +"ec_title" = "Рахмет!"; +"ec_1" = "$1, тіркелуіңіз аяқталуға жақын. Бірнеше минуттан кейін электрондық поштаңызға растау сілтемесі бар хат келуі керек."; +"ec_2" = "Егер қандай да бір себептермен хат келмесе, спам қалтасын тексеріңіз. Хатты ол жерден таппасаңыз, оны қайта жіберуге болады."; +"ec_resend" = "Қайта жіберу"; + /* Discussions */ "discussions" = "Талқылаулар"; @@ -718,7 +756,7 @@ "invalid_telegram_name" = "Telegram парақшаның аты қате"; "invalid_telegram_name_comment" = "Сіз енгізген Telegram-дағы парақшаның аты дұрыс емес."; -"token_manipulation_error" = "Токенді өңдеу қатесі"; +"token_manipulation_error" = "Токенді өндеу қатесі"; "token_manipulation_error_comment" = "Токен жарамсыз немесе мерзімі өтіп кеткен"; "profile_changed" = "Парақша өзгерілді"; @@ -758,6 +796,26 @@ "about_openvk" = "OpenVK туралы"; +"about_this_instance" = "Инстанция туралы"; +"rules" = "Ережелер"; +"most_popular_groups" = "Ең танымал топтар"; +"on_this_instance_are" = "Осы инстанцияда:"; + +"about_users_one" = "1 қолданушы"; +"about_users_other" = "$1 қолданушы"; + +"about_online_users_one" = "1 желідегі пайдаланушы"; +"about_online_users_other" = "$1 желідегі пайдаланушы"; + +"about_active_users_one" = "1 белсенді пайдаланушы"; +"about_active_users_other" = "$1 белсенді пайдаланушы"; + +"about_groups_one" = "1 топ"; +"about_groups_other" = "$1 топ"; + +"about_wall_posts_one" = "1 жазба"; +"about_wall_posts_other" = "$1 жазба"; + /* Dialogs */ "ok" = "ОК"; From b7b1a9b31ccd64f32f8e2fdac08a21afba3cff9f Mon Sep 17 00:00:00 2001 From: veselcraft Date: Sat, 5 Feb 2022 17:50:24 +0300 Subject: [PATCH 11/38] Wall: Add RSS output Currently it doesn't support Images and Reposts, but in future i'll do that. Reversly related to #437 XD git status! ALSO IT'S TIME TO UPDATE COMPOSER git status! --- Web/Presenters/WallPresenter.php | 50 ++++++++++++++++- Web/routes.yml | 2 + composer.json | 3 +- composer.lock | 92 ++++++++++++++++++++++++-------- 4 files changed, 123 insertions(+), 24 deletions(-) diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php index ccb13886..60d083dd 100644 --- a/Web/Presenters/WallPresenter.php +++ b/Web/Presenters/WallPresenter.php @@ -5,6 +5,9 @@ use openvk\Web\Models\Entities\Notifications\{RepostNotification, WallPostNotifi use openvk\Web\Models\Repositories\{Posts, Users, Clubs, Albums}; use Chandler\Database\DatabaseConnection; use Nette\InvalidStateException as ISE; +use Bhaktaraz\RSSGenerator\Item; +use Bhaktaraz\RSSGenerator\Feed; +use Bhaktaraz\RSSGenerator\Channel; final class WallPresenter extends OpenVKPresenter { @@ -52,14 +55,14 @@ final class WallPresenter extends OpenVKPresenter $canPost = $owner->getPrivacyPermission("wall.write", $this->user->identity); else $this->flashFail("err", tr("error"), "Ошибка доступа"); - } else if($user < 0) { + } else if($user < 0) { if($owner->canBeModifiedBy($this->user->identity)) $canPost = true; else $canPost = $owner->canPost(); } else { $canPost = false; - } + } if ($embedded == true) $this->template->_template = "components/wall.xml"; $this->template->oObj = $owner; @@ -82,6 +85,49 @@ final class WallPresenter extends OpenVKPresenter { $this->renderWall($user, true); } + + function renderRSS(int $user): void + { + if(false) + exit("Ошибка доступа: " . (string) random_int(0, 255)); + + $owner = ($user < 0 ? (new Clubs) : (new Users))->get(abs($user)); + if(is_null($this->user)) { + $canPost = false; + } else if($user > 0) { + if(!$owner->isBanned()) + $canPost = $owner->getPrivacyPermission("wall.write", $this->user->identity); + else + $this->flashFail("err", tr("error"), "Ошибка доступа"); + } else if($user < 0) { + if($owner->canBeModifiedBy($this->user->identity)) + $canPost = true; + else + $canPost = $owner->canPost(); + } else { + $canPost = false; + } + + $posts = iterator_to_array($this->posts->getPostsFromUsersWall($user)); + + $feed = new Feed(); + + $channel = new Channel(); + $channel->title(OPENVK_ROOT_CONF['openvk']['appearance']['name'])->url(ovk_scheme(true))->appendTo($feed); + + foreach($posts as $post) { + $item = new Item(); + $item + ->title($post->getOwner()->getCanonicalName()) + ->description($post->getText()) + ->url(ovk_scheme(true)."/wall{$post->getPrettyId()}") + ->pubDate($post->getPublicationTime()->timestamp()) + ->appendTo($channel); + } + + header("Content-Type: application/rss+xml"); + exit($feed); + } function renderFeed(): void { diff --git a/Web/routes.yml b/Web/routes.yml index c8cc0439..65d1df1f 100644 --- a/Web/routes.yml +++ b/Web/routes.yml @@ -105,6 +105,8 @@ routes: hashTag: ".++" - url: "/wall{num}" handler: "Wall->wall" + - url: "/wall{num}/rss" + handler: "Wall->rss" - url: "/wall{num}/makePost" handler: "Wall->makePost" - url: "/wall{num}_{num}" diff --git a/composer.json b/composer.json index 396eea06..7cfa85e7 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,8 @@ "lfkeitel/phptotp": "dev-master", "chillerlan/php-qrcode": "dev-main", "vearutop/php-obscene-censor-rus": "dev-master", - "erusev/parsedown": "dev-master" + "erusev/parsedown": "dev-master", + "bhaktaraz/php-rss-generator": "dev-master" }, "minimum-stability": "dev" } diff --git a/composer.lock b/composer.lock index 8ad0ecb4..99071bc9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3816f5fbf2c78a3e252637476cd2ae08", + "content-hash": "2c94032cae911ca438bbcfc46c346961", "packages": [ { "name": "al/emoji-detector", @@ -52,6 +52,55 @@ }, "time": "2020-06-26T09:10:17+00:00" }, + { + "name": "bhaktaraz/php-rss-generator", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/bhaktaraz/php-rss-generator.git", + "reference": "53cf11db18d87e65973e6df453fb8c1382e5a3bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/bhaktaraz/php-rss-generator/zipball/53cf11db18d87e65973e6df453fb8c1382e5a3bd", + "reference": "53cf11db18d87e65973e6df453fb8c1382e5a3bd", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-4": { + "Bhaktaraz\\RSSGenerator\\": "Source/Bhaktaraz/RSSGenerator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bhaktaraz Bhatta", + "email": "bhattabhakta@gmail.com" + } + ], + "description": "Simple RSS generator library for PHP 5.5 or later.", + "homepage": "https://github.com/bhaktaraz/php-rss-generator", + "keywords": [ + "Facebook product feed generator", + "feed", + "generator", + "rss", + "writer" + ], + "support": { + "issues": "https://github.com/bhaktaraz/php-rss-generator/issues", + "source": "https://github.com/bhaktaraz/php-rss-generator/tree/master" + }, + "time": "2021-03-15T10:59:47+00:00" + }, { "name": "chillerlan/php-qrcode", "version": "dev-main", @@ -520,12 +569,12 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -600,12 +649,12 @@ "source": { "type": "git", "url": "https://github.com/JamesHeinrich/getID3.git", - "reference": "46346ff3bea96a63f1a1d58ee4eabc79471d0ec8" + "reference": "2279f7caca2d761dfc580dd02b401e7a1ff69dfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/46346ff3bea96a63f1a1d58ee4eabc79471d0ec8", - "reference": "46346ff3bea96a63f1a1d58ee4eabc79471d0ec8", + "url": "https://api.github.com/repos/JamesHeinrich/getID3/zipball/2279f7caca2d761dfc580dd02b401e7a1ff69dfe", + "reference": "2279f7caca2d761dfc580dd02b401e7a1ff69dfe", "shasum": "" }, "require": { @@ -660,7 +709,7 @@ "issues": "https://github.com/JamesHeinrich/getID3/issues", "source": "https://github.com/JamesHeinrich/getID3/tree/master" }, - "time": "2022-01-03T16:59:52+00:00" + "time": "2022-02-03T17:07:51+00:00" }, { "name": "komeiji-satori/curl", @@ -1069,12 +1118,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1154,12 +1203,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -1235,12 +1284,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1512,7 +1561,8 @@ "lfkeitel/phptotp": 20, "chillerlan/php-qrcode": 20, "vearutop/php-obscene-censor-rus": 20, - "erusev/parsedown": 20 + "erusev/parsedown": 20, + "bhaktaraz/php-rss-generator": 20 }, "prefer-stable": false, "prefer-lowest": false, From 6b0da27328c8cfce20d98ac7e018655cc9758d3d Mon Sep 17 00:00:00 2001 From: veselcraft Date: Sat, 5 Feb 2022 17:58:02 +0300 Subject: [PATCH 12/38] Wall: [RSS] Fix URLs --- Web/Presenters/WallPresenter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php index 60d083dd..bf5a5b8d 100644 --- a/Web/Presenters/WallPresenter.php +++ b/Web/Presenters/WallPresenter.php @@ -113,14 +113,14 @@ final class WallPresenter extends OpenVKPresenter $feed = new Feed(); $channel = new Channel(); - $channel->title(OPENVK_ROOT_CONF['openvk']['appearance']['name'])->url(ovk_scheme(true))->appendTo($feed); + $channel->title(OPENVK_ROOT_CONF['openvk']['appearance']['name'])->url(ovk_scheme(true) . $_SERVER["SERVER_NAME"])->appendTo($feed); foreach($posts as $post) { $item = new Item(); $item ->title($post->getOwner()->getCanonicalName()) ->description($post->getText()) - ->url(ovk_scheme(true)."/wall{$post->getPrettyId()}") + ->url(ovk_scheme(true).$_SERVER["SERVER_NAME"]."/wall{$post->getPrettyId()}") ->pubDate($post->getPublicationTime()->timestamp()) ->appendTo($channel); } From 77cc83ca1333b0e0ccfa5d2632d45b6705a527c7 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Sat, 5 Feb 2022 18:31:16 +0300 Subject: [PATCH 13/38] README: Add Matrix chat --- README.md | 3 ++- README_RU.md | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 41c12559..43f8e958 100644 --- a/README.md +++ b/README.md @@ -78,8 +78,9 @@ You may reach out to us via: * Telegram chat: Go to [our channel](https://t.me/openvkenglish) and open discussion in our channel menu. * [Reddit](https://www.reddit.com/r/openvk/) * [Discussions](https://github.com/openvk/openvk/discussions) +* Matrix chat: #openvk:matrix.org -**Attention**: bug tracker and telegram chat are public places. And ticketing system is being served by volunteers. If you need to report something, that shouldn't be immediately disclosed to general public (for instance, vulnerability report), please use contact us directly at this email: **openvk [at] tutanota [dot] com** +**Attention**: bug tracker, telegram and matrix chat are public places. And ticketing system is being served by volunteers. If you need to report something, that shouldn't be immediately disclosed to general public (for instance, vulnerability report), please use contact us directly at this email: **openvk [at] tutanota [dot] com** Get it on Codeberg diff --git a/README_RU.md b/README_RU.md index 480552a3..65b0dbd6 100644 --- a/README_RU.md +++ b/README_RU.md @@ -78,8 +78,9 @@ ln -s /path/to/chandler/extensions/available/openvk /path/to/chandler/extensions * Telegram-чат: Перейдите на [наш канал](https://t.me/openvkch) и откройте обсуждение в меню нашего канала. * [Reddit](https://www.reddit.com/r/openvk/) * [Обсуждения](https://github.com/openvk/openvk/discussions) +* Чат в Matrix: #ovk:matrix.org -**Внимание**: баг-трекер и телеграм-чат являются публичными местами, и жалобы в OVK обслуживается волонтерами. Если вам нужно сообщить о чем-то, что не должно быть раскрыто широкой публике (например, сообщение об уязвимости), пожалуйста, свяжитесь с нами напрямую по этому адресу: **openvk [at] tutanota [dot] com**. +**Внимание**: баг-трекер, телеграм- и matrix-чат являются публичными местами, и жалобы в OVK обслуживается волонтерами. Если вам нужно сообщить о чем-то, что не должно быть раскрыто широкой публике (например, сообщение об уязвимости), пожалуйста, свяжитесь с нами напрямую по этому адресу: **openvk [at] tutanota [dot] com**. Get it on Codeberg From 9d4478516f0182e433236e4af50a21b0ef40b705 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Sat, 5 Feb 2022 20:24:46 +0300 Subject: [PATCH 14/38] Post, Comment: Add a link to profile when clicking on PFP --- .../templates/components/comment.xml | 10 ++++++---- .../components/post/microblogpost.xml | 20 ++++++++++--------- .../templates/components/post/oldpost.xml | 9 ++++++--- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Web/Presenters/templates/components/comment.xml b/Web/Presenters/templates/components/comment.xml index 774fc4d9..5671ac54 100644 --- a/Web/Presenters/templates/components/comment.xml +++ b/Web/Presenters/templates/components/comment.xml @@ -7,10 +7,12 @@ - + + +
diff --git a/Web/Presenters/templates/components/post/microblogpost.xml b/Web/Presenters/templates/components/post/microblogpost.xml index 2e35c0f0..d50d9b02 100644 --- a/Web/Presenters/templates/components/post/microblogpost.xml +++ b/Web/Presenters/templates/components/post/microblogpost.xml @@ -8,15 +8,17 @@ - - {if !$post->isPostedOnBehalfOfGroup() && !$compact} - - {_online} - - {/if} + + + {if !$post->isPostedOnBehalfOfGroup() && !$compact} + + {_online} + + {/if} +
diff --git a/Web/Presenters/templates/components/post/oldpost.xml b/Web/Presenters/templates/components/post/oldpost.xml index f2769636..6c2958e7 100644 --- a/Web/Presenters/templates/components/post/oldpost.xml +++ b/Web/Presenters/templates/components/post/oldpost.xml @@ -4,14 +4,17 @@ - + + + {if !$post->isPostedOnBehalfOfGroup() && !($compact ?? false)} {_online} {/if} +
From 51ace8d88832cc95e6c9aaf0dc4bc7cc827e1bdb Mon Sep 17 00:00:00 2001 From: Celestora Date: Sat, 5 Feb 2022 20:09:37 +0200 Subject: [PATCH 15/38] Enforce usage of non-empty, correct profile names. Resolves #456 --- Web/Models/Entities/User.php | 19 +++++++++++++++++++ .../Exceptions/InvalidUserNameException.php | 7 +++++++ Web/Presenters/UserPresenter.php | 10 ++++++++-- locales/en.strings | 2 ++ locales/ru.strings | 2 ++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 Web/Models/Exceptions/InvalidUserNameException.php diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 84e48041..37fbe3bc 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -5,6 +5,7 @@ use openvk\Web\Util\DateTime; use openvk\Web\Models\RowModel; use openvk\Web\Models\Entities\{Photo, Message, Correspondence, Gift}; use openvk\Web\Models\Repositories\{Users, Clubs, Albums, Gifts, Notifications}; +use openvk\Web\Models\Exceptions\InvalidUserNameException; use Nette\Database\Table\ActiveRow; use Chandler\Database\DatabaseConnection; use Chandler\Security\User as ChandlerUser; @@ -739,6 +740,24 @@ class User extends RowModel return true; } + function setFirst_Name(string $firstName): void + { + $firstName = mb_convert_case($firstName, MB_CASE_TITLE); + if(!preg_match('%^\p{Lu}\p{Mn}?(?:\p{L&}\p{Mn}?){1,16}$%u', $firstName)) + throw new InvalidUserNameException; + + $this->stateChanges("first_name", $firstName); + } + + function setLast_Name(string $lastName): void + { + $lastName = mb_convert_case($lastName, MB_CASE_TITLE); + if(!preg_match('%^\p{Lu}\p{Mn}?(\p{L&}\p{Mn}?){1,16}(\-\g<1>+)?$%u', $lastName)) + throw new InvalidUserNameException; + + $this->stateChanges("last_name", $lastName); + } + function setNsfwTolerance(int $tolerance): void { $this->stateChanges("nsfw_tolerance", $tolerance); diff --git a/Web/Models/Exceptions/InvalidUserNameException.php b/Web/Models/Exceptions/InvalidUserNameException.php new file mode 100644 index 00000000..12a595a6 --- /dev/null +++ b/Web/Models/Exceptions/InvalidUserNameException.php @@ -0,0 +1,7 @@ +willExecuteWriteAction($_GET['act'] === "status"); if($_GET['act'] === "main" || $_GET['act'] == NULL) { - $user->setFirst_Name(empty($this->postParam("first_name")) ? $user->getFirstName() : $this->postParam("first_name")); - $user->setLast_Name(empty($this->postParam("last_name")) ? "" : $this->postParam("last_name")); + try { + $user->setFirst_Name(empty($this->postParam("first_name")) ? $user->getFirstName() : $this->postParam("first_name")); + $user->setLast_Name(empty($this->postParam("last_name")) ? "" : $this->postParam("last_name")); + } catch(InvalidUserNameException $ex) { + $this->flashFail("err", tr("error"), tr("invalid_real_name")); + } + $user->setPseudo(empty($this->postParam("pseudo")) ? NULL : $this->postParam("pseudo")); $user->setStatus(empty($this->postParam("status")) ? NULL : $this->postParam("status")); if (strtotime($this->postParam("birthday")) < time()) diff --git a/locales/en.strings b/locales/en.strings index 55b6ba28..9d0f7ef6 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -750,6 +750,8 @@ "invalid_email_address" = "Invalid Email address"; "invalid_email_address_comment" = "The Email you entered is not correct."; +"invalid_real_name" = "Please, enter your real name. It'll be easier for your friends to find you like this."; + "invalid_birth_date" = "Invalid date of birth"; "invalid_birth_date_comment" = "The date of birth you entered is not correct."; diff --git a/locales/ru.strings b/locales/ru.strings index 085d9fae..c20a5719 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -785,6 +785,8 @@ "invalid_email_address" = "Неверный Email адрес"; "invalid_email_address_comment" = "Email, который вы ввели, не является корректным."; +"invalid_real_name" = "Пожалуйста, используйте реальные имена. Так вашим тульпам будет легче найти вас."; + "invalid_telegram_name" = "Неверное имя Telegram аккаунта"; "invalid_telegram_name_comment" = "Вы ввели неверное имя аккаунта Telegram."; From 3582156946af2894b31ba5b490c5cf39bc4129b7 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sun, 6 Feb 2022 12:47:14 +0300 Subject: [PATCH 16/38] Global: Remove arg for n:ifcontent from the footer --- Web/Presenters/templates/@layout.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 9d723096..e6697c9d 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -262,7 +262,7 @@ {_footer_privacy}

OpenVK {php echo OPENVK_VERSION} | PHP: {phpversion()} | DB: {$dbVersion}

-

+

{php echo OPENVK_ROOT_CONF["openvk"]["appearance"]["motd"]}

From 4a0c04aa70725eb6acec0b61b02a622a66bbb16e Mon Sep 17 00:00:00 2001 From: lvl <90154880+apeeh@users.noreply.github.com> Date: Sun, 6 Feb 2022 13:47:17 +0400 Subject: [PATCH 17/38] AM strings update... again yeah --- locales/am.strings | 126 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 112 insertions(+), 14 deletions(-) diff --git a/locales/am.strings b/locales/am.strings index b77f4c3a..23243c49 100644 --- a/locales/am.strings +++ b/locales/am.strings @@ -37,6 +37,13 @@ "password_reset_error" = "Անկանխատեսելի սխալ գաղտնաբառի զրոյացման ժամանակ։"; "password_reset_rate_limit_error" = "Հազար ներողություն, բայց այդպես շատ հաճախ չի կարելի անել։"; +"email_sent" = "Նամակը հաջողությամբ ուղարկվել է։"; +"email_sent_desc" = "Եթե ձեր էլ․ հասցեն գոյություն ունի, Դուք կստանաք նամակը։"; +"email_error" = "Անկանխատեսելի սխալ նամակ ուղարկելու ժամանակ։"; +"email_rate_limit_error" = "Կներեք, չափից շատ նամակ ուղարկել չի կարելի։"; + +"email_verify_success" = "Ձեր E-Mail-ը հաստատված է։ Հաճելի՛ ժամանց։"; + "registration_disabled_info" = "Գրանցումները անջատված են համակարգային ադմինիստրատորի կողմից։ Հնարավորության դեպքում, խնդրեք հրավերք արդեն գրանցված օգտատերերից։"; "registration_closed" = "Գրանցումը փակ է։"; "invites_you_to" = "$1 ձեզ հրավիրում է $2"; @@ -137,6 +144,8 @@ /* Wall */ +"feed" = "Լուրեր"; + "post_writes_m" = "գրել է"; "post_writes_f" = "գրել է"; "post_writes_g" = "հրապարակել են"; @@ -147,6 +156,9 @@ "delete" = "Ջնջել"; "comments" = "Մեկնաբանություններ"; "share" = "Կիսվել"; +"pin" = "Ամրացնել"; +"unpin" = "Հետ ամրացնել"; +"pinned" = "ամրացված"; "comments_tip" = "Եղե՛ք առաջինը ով կթողնի իր կարծիքը։"; "your_comment" = "Ձեր մեկնաբանությունը"; "comments" = "Մեկնաբանություններ"; @@ -157,7 +169,6 @@ "wall_few" = "$1 գրություն"; "wall_many" = "$1 գրություն"; "wall_other" = "$1 գրություն"; - "publish_post" = "Ավելացնել գրություն"; "view_other_comments" = "Կարդալ մեկնաբանությունները"; @@ -172,7 +183,10 @@ "contains_nsfw" = "Պարունակում է NSFW մատերիալ"; "nsfw_warning" = "Այս պոստը կարող է պարունակել 18+ մատերիալ։"; "report" = "Բողոքարկել"; +"attach" = "Ամրացնել"; "attach_photo" = "Ամրացնել նկար"; +"attach_video" = "Ամրացնել վիդեո"; +"draw_graffiti" = "Նկարել գրաֆիտի"; "no_posts_abstract" = "Այստեղ ոչ ոք, ոչինչ․․․ դեռ չի գրել․․․"; "attach_no_longer_available" = "Այս հավելվածը այլևս հասանելի չէ"; "open_post" = "Բացել գրությունը"; @@ -220,6 +234,7 @@ "subscriptions" = "Բաժանորդագրություններ"; "join_community" = "Մտնել խումբ"; "leave_community" = "Լքել խումբը"; +"check_community" = "Դիտել խումբը"; "min_6_community" = "Անվանումը չպետք է լինի 6 նշից պակաս"; "participants" = "Անդամներ"; "groups" = "Խմբեր"; @@ -237,6 +252,7 @@ "only_administrators" = "Միայն ադմինիստրատորները"; "website" = "Վեբկայք"; "managed" = "Կառավարվում է"; +"size" = "Չափ"; "administrators_one" = "$1 ադմինիստրատոր"; "administrators_few" = "$1 ադմինիստրատոր"; @@ -245,12 +261,14 @@ "role" = "Դեր"; "administrator" = "Ադմինիստրատոր"; "promote_to_admin" = "Բարձրացնել դեպի ադմինիստրատոր"; +"promote_to_owner" = "Назначить владельцем"; "devote" = "Հետ բողոքարկել"; "group_allow_post_for_everyone" = "Թույլ տար գրություններ թողնել բոլորին"; "set_comment" = "Փոփոխել մեկնաբանությունը"; "hidden_yes" = "Թաքցված է"; "hidden_no" = "Թաքցված չէ"; "group_allow_post_for_everyone" = "Թույլատրել հրապարակել բոլորին"; +"group_hide_from_global_feed" = "Չցույց տալ հրապարակությունները ընդհանուր լրահոսում։"; "statistics" = "Ստատիստիկա"; "group_administrators_list" = "Ադմինների ցուցակ"; "group_display_only_creator" = "Ցույց տալ միայն խմբի ստեղծողին"; @@ -273,12 +291,22 @@ "groups_many" = "$1 խումբ"; "groups_other" = "$1 խումբ"; +"groups_list_zero" = "Դուք չեք կայանում ոչ մի խմբում"; +"groups_list_one" = "Դուք կաք միայն մեկ խմբում"; +"groups_list_other" = "Դուք կաք $1 խմբում"; + "meetings_zero" = "Ոչ մի հանդիպում"; "meetings_one" = "Մեկ հանդիպում"; "meetings_few" = "$1 հանդիպում"; "meetings_many" = "$1 հանդիպում"; "meetings_other" = "$1 հանդիպում"; +"open_new_group" = "Նոր խումբ բացել"; +"open_group_desc" = "Չե՞ք կարող խումբ գտնել, բացեք ձերը․․․"; +"search_group" = "Խմբի որոնում"; +"search_by_groups" = "Որոնում ըստ խմբերի"; +"search_group_desc" = "Այստեղ դուք կարող եք փնտրել խմբեր և ընտրել ձեզ ամենահարմարը․․․"; + /* Albums */ "create" = "Ստեղծել"; @@ -309,8 +337,8 @@ "text_note" = "Պարունակություն"; "create_note" = "Ստեղծել նշում"; "actions" = "Գործողություններ"; -"feed" = "Լուրեր"; -"publish_post" = "Ավելացնել գրություն"; +"edit_note" = "Խմբագրել նշումը"; +"edited" = "Խմբագրված է"; "notes_zero" = "Ոչ մի նշում չկա"; "notes_one" = "Մեկ նշում"; @@ -337,9 +365,11 @@ "menu_registration" = "Գրանցում"; "menu_help" = "Օգնություն"; -"header_home" = "Գլխավոր"; +"menu_logout" = "Դուրս գալ"; +"menu_support" = "Օգնություն"; + +"header_home" = "գլխավոր"; "header_groups" = "խմբեր"; -"header_donate" = "օգնել"; "header_people" = "մարդիկ"; "header_invite" = "հրավիրել"; "header_help" = "օգնություն"; @@ -351,18 +381,14 @@ "left_menu_donate" = "Աջակցել"; + +"footer_about_instance" = "հոսքի մասին"; "footer_blog" = "բլոգ"; "footer_help" = "օգնություն"; "footer_developers" = "մշակողներին"; "footer_choose_language" = "ընտրել լեզուն"; "footer_privacy" = "գաղտնիություն"; -"notes_zero" = "Ոչ մի նշում չկա"; -"notes_one" = "Մեկ նշում"; -"notes_few" = "$1 նշում"; -"notes_many" = "$1 նշում"; -"notes_other" = "$1 նշում"; - /* Settings */ "main" = "Հիմնական"; @@ -387,9 +413,12 @@ "cut" = "Կտրվածք"; "round_avatars" = "Կլոր ավատար"; +"apply_style_for_this_device" = "Հաստատել տեսքը միայն այս սարքի համար"; + "search_for_groups" = "Խմբերի որոնում"; "search_for_people" = "Մարդկանց որոնում"; "search_button" = "Որոնել"; +"search_placeholder" = "Գրեք ցանկացած անուն, անվանում կամ բառ"; "results_zero" = "Ոչ մի արդյունք"; "results_one" = "Մեկ արդյունք"; "results_few" = "$1 արդյունք"; @@ -405,6 +434,7 @@ "privacy_setting_see_friends" = "Ում են երևում իմ ընկերները"; "privacy_setting_add_to_friends" = "Ով կարող է ինձ ընկեր կոչել"; "privacy_setting_write_wall" = "Ով կարող է գրել իմ պատին"; +"privacy_setting_write_messages" = "Ով կարող է ինձ նամակներ գրել"; "privacy_value_anybody" = "Բոլոր ցանկացողները"; "privacy_value_anybody_dative" = "Բոլոր ցանկացողներին"; "privacy_value_users" = "OpenVK–ի օգտատերերին"; @@ -429,6 +459,11 @@ "ui_settings_rating_show" = "Ցուցադրել"; "ui_settings_rating_hide" = "Թաքցնել"; +"additional_links" = "Հավելյալ հղումներ"; +"ad_poster" = "Գովազդային վահանակ"; + +/* Two-factor authentication */ + "two_factor_authentication" = "Երկքայլ աուտենտիֆիկացիա"; "two_factor_authentication_disabled" = "Ապահովում է հուսալի պաշտպանում ջարդումից․ անհրաժեշտ է ներմուծել 2FA-ով ստացված կոդը։"; "two_factor_authentication_enabled" = "Երկքայլ աուտենտիֆիկացիան միացված է։ Ձեր էջը պաշտպանված է։"; @@ -513,6 +548,7 @@ "nt_post_instrumental" = "պոստով"; "nt_note_instrumental" = "նշումով"; "nt_photo_instrumental" = "նկարով"; +"nt_topic_instrumental" = "թեմայով"; /* Time */ @@ -523,6 +559,10 @@ "time_today" = "այսօր"; "time_yesterday" = "երեկ"; +"points" = "Ձայն"; +"points_count" = "ձայն"; +"on_your_account" = "ձեր հաշվում"; + "your_email_address" = "Ձեր էլեկտրոնային հասցեն"; "your_page_address" = "Ձեր էջի հասցեն"; "page_address" = "Էջի հասցեն"; @@ -593,6 +633,11 @@ "gifts_few" = "$1 նվեր"; "gifts_many" = "$1 նվեր"; "gifts_other" = "$1 նվեր"; +"gifts_left" = "Մնաց $1 նվեր"; +"gifts_left_one" = "Մնաց մեկ նվեր"; +"gifts_left_few" = "$1 նվեր մնաց"; +"gifts_left_many" = "$1 նվեր մնաց"; +"gifts_left_other" = "$1 նվեր մնաց"; "send_gift" = "Ուղարկել նվեր"; @@ -612,9 +657,6 @@ "users_gifts" = "Նվերներ"; -"comment" = "Մեկնաբանություն"; -"sender" = "Ուղարկող"; - /* Support */ "support_opened" = "Բաց"; @@ -638,11 +680,29 @@ "support_new_title" = "Գրե՛ք ձեր դիմումի վերնագիրը"; "support_new_content" = "Նկարագրե՛ք խնդիրը կամ առաջարկը"; +"support_rate_good_answer" = "Սա լավ պատասխան է"; +"support_rate_bad_answer" = "Սա վատ պատասխան է"; +"support_good_answer_user" = "Դուք թողել եք դրական ակնարկ։"; +"support_bad_answer_user" = "Դուք թողել եք բացասական ակնարկ։"; +"support_good_answer_agent" = "Օգտատերը թողել է դրական ակնարկ"; +"support_bad_answer_agent" = "Օգտատերը թողել է բացասական ակնարկ"; +"support_rated_good" = "Դուք թողել եք դրական ակնարկ պատասխանի մասին։"; +"support_rated_bad" = "Դուք թողել եք բացասական ակնարկ պատասխանի մասին։"; +"wrong_parameters" = "Հարցման սխալ կարգավորումներ"; + +"fast_answers" = "Արագ պատասխաններ"; + "comment" = "Մեկնաբանություն"; "sender" = "Ուղարկող"; "author" = "Հեղինակ"; +"you_have_not_entered_text" = "Դուք չեք գրել տեքստ"; +"you_have_not_entered_name_or_text" = "Դուք անուն կամ տեքստ չեք գրել"; + +"ticket_changed" = "Տոմսը փոփոխված է"; +"ticket_changed_comment" = "Փոփոխությունները ուժի մեջ կմտնեն մի քանի վայրկյանից։"; + /* Invite */ "invite" = "Հրավիրել"; @@ -658,6 +718,14 @@ "banned_2" = "Պատճառը հետևյալն է․ $1. Ափսոս, բայց մենք ստիպված Ձեզ հավերժ ենք կասեցրել;"; "banned_3" = "Դուք դեռ կարող եք գրել նամակ աջակցության ծառայությանը, եթե համարում եք որ դա սխալմունք է, կամ էլ կարող եք դուրս գալ։"; +/* Registration confirm */ + +"ec_header" = "Գրանցման հաստատում"; +"ec_title" = "Շնորհակալությո՛ւն"; +"ec_1" = "$1, Ձեր գրանցումը համարյա ավարտվել է։ Մի քանի վայրկյանի ընթացքում ձեր էլ․ փոստին պետք է գա հաստատման հղում։"; +"ec_2" = "Եթե ինչ-որ պատճառներով Ձեզ չի հասել նամակը, ստուգեք Սպամի պանակը։ Եթե այնտեղ էլ նամակը չգտնեք, դուք կարող եք նորից ուղարկել նամակը։"; +"ec_resend" = "Վերաուղարկել նամակը"; + /* Discussions */ "discussions" = "Քննարկումներ"; @@ -785,6 +853,36 @@ "about_openvk" = "OpenVK-ի մասին"; +"about_this_instance" = "Այս հոսքի մասին"; +"rules" = "Կանոններ"; +"most_popular_groups" = "Ամենահայտնի խմբերը"; +"on_this_instance_are" = "Այս հոսքում․"; + +"about_users_one" = "Մեկ օգտատեր"; +"about_users_few" = "$1 օգտատեր"; +"about_users_many" = "$1 օգտատեր"; +"about_users_other" = "$1 օգտատեր"; + +"about_online_users_one" = "Մեկ օգտատեր է ցանցի մեջ"; +"about_online_users_few" = "$1 օգտատեր է ցանցի մեջ"; +"about_online_users_many" = "$1 օգտատեր է ցանցի մեջ"; +"about_online_users_other" = "$1 օգտատեր է ցանցի մեջ"; + +"about_active_users_one" = "Մեկ ակտիվ օգտատեր"; +"about_active_users_few" = "$1 ակտիվ օգտատեր"; +"about_active_users_many" = "$1 ակտիվ օգտատեր"; +"about_active_users_other" = "$1 ակտիվ օգտատեր"; + +"about_groups_one" = "Մեկ խումբ"; +"about_groups_few" = "$1 խումբ"; +"about_groups_many" = "$1 խումբ"; +"about_groups_other" = "$1 խումբ"; + +"about_wall_posts_one" = "Մեկ գրություն պատերի վրա"; +"about_wall_posts_few" = "$1 գրություն պատերի վրա"; +"about_wall_posts_many" = "$1 գրություն պատերի վրա"; +"about_wall_posts_other" = "$1 գրություն պատերի վրա"; + /* Dialogs */ "ok" = "ОК"; From e5afb0fc88ad20a229f24812f5e893906dceaab8 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sun, 6 Feb 2022 16:09:26 +0300 Subject: [PATCH 18/38] Users, Groups: Fix URL avatar output This commit fixes the avatar URL output for those who visit the website with a port (e.g. ovk.domain.tld:1337) --- Web/Models/Entities/Club.php | 12 +----------- Web/Models/Entities/User.php | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Web/Models/Entities/Club.php b/Web/Models/Entities/Club.php index 2230b1a0..0c91b11e 100644 --- a/Web/Models/Entities/Club.php +++ b/Web/Models/Entities/Club.php @@ -40,7 +40,7 @@ class Club extends RowModel function getAvatarUrl(): string { - $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"]; + $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"]; $avPhoto = $this->getAvatarPhoto(); return is_null($avPhoto) ? "$serverUrl/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL(); @@ -64,16 +64,6 @@ class Club extends RowModel else return "/club" . $this->getId(); } - /* - function getAvatarUrl(): string - { - $avAlbum = (new Albums)->getUserAvatarAlbum($this); - $avCount = $avAlbum->getPhotosCount(); - $avPhotos = $avAlbum->getPhotos($avCount, 1); - $avPhoto = iterator_to_array($avPhotos)[0] ?? NULL; - - return is_null($avPhoto) ? "/assets/packages/static/openvk/img/camera_200.png" : $avPhoto->getURL(); - } */ function getName(): string { diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 37fbe3bc..36077375 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -104,7 +104,7 @@ class User extends RowModel function getAvatarUrl(): string { - $serverUrl = ovk_scheme(true) . $_SERVER["SERVER_NAME"]; + $serverUrl = ovk_scheme(true) . $_SERVER["HTTP_HOST"]; if($this->getRecord()->deleted) return "$serverUrl/assets/packages/static/openvk/img/camera_200.png"; From 170343e989d2dacee8ec997a9da4bd3fa42d59e6 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Sun, 6 Feb 2022 16:44:49 +0300 Subject: [PATCH 19/38] Videos: Use an actual thumbnail for YT videos --- Web/Models/VideoDrivers/YouTubeVideoDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Models/VideoDrivers/YouTubeVideoDriver.php b/Web/Models/VideoDrivers/YouTubeVideoDriver.php index 1c5b3160..f517d7fd 100644 --- a/Web/Models/VideoDrivers/YouTubeVideoDriver.php +++ b/Web/Models/VideoDrivers/YouTubeVideoDriver.php @@ -5,7 +5,7 @@ final class YouTubeVideoDriver extends VideoDriver { function getThumbnailURL(): string { - return "https://img.youtube.com/vi/$this->id/mq3.jpg"; + return "https://img.youtube.com/vi/$this->id/mqdefault.jpg"; } function getURL(): string From b5524b6b7b586e6f94308c050b80059eb9099b44 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Mon, 7 Feb 2022 14:06:47 +0200 Subject: [PATCH 20/38] Users: Fix page with list of user's groups --- Web/Presenters/templates/@listView.xml | 4 +-- Web/Presenters/templates/User/Groups.xml | 31 ++++-------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/Web/Presenters/templates/@listView.xml b/Web/Presenters/templates/@listView.xml index e6bfaa8a..e6d02350 100644 --- a/Web/Presenters/templates/@listView.xml +++ b/Web/Presenters/templates/@listView.xml @@ -27,8 +27,8 @@ - {ifset infotable} - {include infotable, x => $dat} + {ifset infoTable} + {include infoTable, x => $dat} {else} diff --git a/Web/Presenters/templates/User/Groups.xml b/Web/Presenters/templates/User/Groups.xml index 3a92bed8..f1926d1e 100644 --- a/Web/Presenters/templates/User/Groups.xml +++ b/Web/Presenters/templates/User/Groups.xml @@ -32,7 +32,7 @@ {/block} {block size} -
+
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} {tr("groups_list", $thisUser->getClubCount())} @@ -51,6 +51,8 @@ Фотография группы {/block} +{block name}{/block} + {block infoTable} @@ -73,11 +75,11 @@ {block actions} {var clubPinned = $thisUser->isClubPinned($x)} {if $x->canBeModifiedBy($thisUser ?? NULL)} - + {_check_community} {if ($clubPinned || $thisUser->getPinnedClubCount() <= 10)} - + {if $clubPinned} {_remove_from_left_menu} {else} @@ -116,26 +118,3 @@ {/if} {/block} - -{block bottom} - {if !is_null($thisUser) && $user->getId() === $thisUser->getId()} -
-
-

{_open_new_group}

- {_open_group_desc} - - - -
-
-

{_search_group}

- {_search_group_desc} -
- - - - -
-
- {/if} -{/block} \ No newline at end of file From 9425180a6f62ce708d72ea89af4cc462bab02844 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Mon, 7 Feb 2022 14:31:02 +0200 Subject: [PATCH 21/38] Global: Add ability to configure display of commit hash --- bootstrap.php | 2 +- openvk-example.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap.php b/bootstrap.php index 70b52244..b2bcbec9 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -227,7 +227,7 @@ return (function() { if(empty($_SERVER["REQUEST_SCHEME"])) $_SERVER["REQUEST_SCHEME"] = empty($_SERVER["HTTPS"]) ? "HTTP" : "HTTPS"; - $showCommitHash = true; # plz remove when release + $showCommitHash = OPENVK_ROOT_CONF["openvk"]["preferences"]["bellsAndWhistles"]["showCommitHash"] ?? true; if(is_dir($gitDir = OPENVK_ROOT . "/.git") && $showCommitHash) $ver = trim(`git --git-dir="$gitDir" log --pretty="%h" -n1 HEAD` ?? "Unknown version") . "-nightly"; else diff --git a/openvk-example.yml b/openvk-example.yml index df9c55ef..a3b98d0c 100644 --- a/openvk-example.yml +++ b/openvk-example.yml @@ -59,6 +59,7 @@ openvk: bellsAndWhistles: fartscroll: false testLabel: false + showCommitHash: true defaultMobileTheme: "" telemetry: From a77aafbcbafe6ce95c7d27340f9ce692019ce288 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Mon, 7 Feb 2022 15:08:38 +0200 Subject: [PATCH 22/38] Revert "Global: Add ability to configure display of commit hash" I did something strange --- bootstrap.php | 2 +- openvk-example.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bootstrap.php b/bootstrap.php index b2bcbec9..70b52244 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -227,7 +227,7 @@ return (function() { if(empty($_SERVER["REQUEST_SCHEME"])) $_SERVER["REQUEST_SCHEME"] = empty($_SERVER["HTTPS"]) ? "HTTP" : "HTTPS"; - $showCommitHash = OPENVK_ROOT_CONF["openvk"]["preferences"]["bellsAndWhistles"]["showCommitHash"] ?? true; + $showCommitHash = true; # plz remove when release if(is_dir($gitDir = OPENVK_ROOT . "/.git") && $showCommitHash) $ver = trim(`git --git-dir="$gitDir" log --pretty="%h" -n1 HEAD` ?? "Unknown version") . "-nightly"; else diff --git a/openvk-example.yml b/openvk-example.yml index a3b98d0c..df9c55ef 100644 --- a/openvk-example.yml +++ b/openvk-example.yml @@ -59,7 +59,6 @@ openvk: bellsAndWhistles: fartscroll: false testLabel: false - showCommitHash: true defaultMobileTheme: "" telemetry: From a48d1cd8ce26af5fbcab865d831ff808f26bfaa9 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Mon, 7 Feb 2022 19:39:54 +0300 Subject: [PATCH 23/38] Notification: Fix pagination (it didn't work) Closes #460 vriska nu i vadristal ty tut v kode xddddd --- Web/Models/Repositories/Notifications.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Models/Repositories/Notifications.php b/Web/Models/Repositories/Notifications.php index 3b93b7a6..bec0b04f 100644 --- a/Web/Models/Repositories/Notifications.php +++ b/Web/Models/Repositories/Notifications.php @@ -37,7 +37,7 @@ class Notifications if(!$count) { $query .= " ORDER BY timestamp DESC"; $query .= " LIMIT " . ($perPage ?? OPENVK_DEFAULT_PER_PAGE); - $query .= " OFFSET " . ((($page - 1) * $perPage) ?? OPENVK_DEFAULT_PER_PAGE); + $query .= " OFFSET " . (($page - 1) * ($perPage ?? OPENVK_DEFAULT_PER_PAGE)); } return $query; From 33df6ef1704fa6c933a5dd9e650a8965a95ce9a4 Mon Sep 17 00:00:00 2001 From: veselcraft Date: Mon, 7 Feb 2022 20:07:03 +0300 Subject: [PATCH 24/38] Profiles: Add ability to set Hometown Closes #461 --- Web/Presenters/UserPresenter.php | 5 ++++- Web/Presenters/templates/User/Edit.xml | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Web/Presenters/UserPresenter.php b/Web/Presenters/UserPresenter.php index 77c80301..5130d22b 100644 --- a/Web/Presenters/UserPresenter.php +++ b/Web/Presenters/UserPresenter.php @@ -147,6 +147,9 @@ final class UserPresenter extends OpenVKPresenter $user->setPseudo(empty($this->postParam("pseudo")) ? NULL : $this->postParam("pseudo")); $user->setStatus(empty($this->postParam("status")) ? NULL : $this->postParam("status")); + $user->setHometown(empty($this->postParam("hometown")) ? NULL : $this->postParam("hometown")); + + if (strtotime($this->postParam("birthday")) < time()) $user->setBirthday(strtotime($this->postParam("birthday"))); @@ -185,7 +188,7 @@ final class UserPresenter extends OpenVKPresenter $user->setCity(empty($this->postParam("city")) ? NULL : $this->postParam("city")); $user->setAddress(empty($this->postParam("address")) ? NULL : $this->postParam("address")); - + $website = $this->postParam("website") ?? ""; if(empty($website)) $user->setWebsite(NULL); diff --git a/Web/Presenters/templates/User/Edit.xml b/Web/Presenters/templates/User/Edit.xml index 21ecf591..96d12f75 100644 --- a/Web/Presenters/templates/User/Edit.xml +++ b/Web/Presenters/templates/User/Edit.xml @@ -80,6 +80,14 @@ + + + +
+ {_"hometown"}: + + +
{_"relationship"}: From 47093f40cce655047e0aa5acdd2a4f482c54a3df Mon Sep 17 00:00:00 2001 From: veselcraft Date: Mon, 7 Feb 2022 20:16:47 +0300 Subject: [PATCH 25/38] Users: Bring back ability to NOT set the last names --- Web/Models/Entities/User.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 36077375..1161cbb6 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -751,9 +751,12 @@ class User extends RowModel function setLast_Name(string $lastName): void { - $lastName = mb_convert_case($lastName, MB_CASE_TITLE); - if(!preg_match('%^\p{Lu}\p{Mn}?(\p{L&}\p{Mn}?){1,16}(\-\g<1>+)?$%u', $lastName)) - throw new InvalidUserNameException; + if(!empty($lastName)) + { + $lastName = mb_convert_case($lastName, MB_CASE_TITLE); + if(!preg_match('%^\p{Lu}\p{Mn}?(\p{L&}\p{Mn}?){1,16}(\-\g<1>+)?$%u', $lastName)) + throw new InvalidUserNameException; + } $this->stateChanges("last_name", $lastName); } From abe4ae0352bac8c6b01413c01882469fed5f87c6 Mon Sep 17 00:00:00 2001 From: Dmitry <72506029+HSDChannel@users.noreply.github.com> Date: Tue, 8 Feb 2022 00:22:13 +0700 Subject: [PATCH 26/38] README.textile -> README.md (#462) --- VKAPI/README.md | 57 ++++++++++++++++++++++++++++++++++++++++++++ VKAPI/README.textile | 31 ------------------------ 2 files changed, 57 insertions(+), 31 deletions(-) create mode 100644 VKAPI/README.md delete mode 100644 VKAPI/README.textile diff --git a/VKAPI/README.md b/VKAPI/README.md new file mode 100644 index 00000000..b3c85918 --- /dev/null +++ b/VKAPI/README.md @@ -0,0 +1,57 @@ +# VK API Compatability layer for OpenVK + +This directory contains VK api handlers, structures and relared +exceptions. It is still a work-in-progress functionality. +**Note**: requests to api are routed through +openvk.Web.Presenters.VKAPIPresenter, this dir contains only handlers. + +## Implementing API methods + +VK API methods have names like this: `example.test`. To implement a +method like this you will need to create a class `Example` in the +Handlers subdirectory. This class **must** extend VKAPIHandler and be +final. +Next step is to create test method. It **must** have a type hint that is +not void. Everything else is fine, the return value of method will be +authomatically converted to JSON and sent back to client. + +### Parameters + +Method arguments are parameters. To declare a parameter just create an +argument with the same name. You should also provide correct type hints +for them. Type conversion is done automatically if possible. If not +possible error №1 will be returned. +If parameter is not passed by client then router will pass default value +to argument. If there is no default value but argument accepts NULL then +NULL will be passed. If NULL is not acceptable, default value is +undefined and parameter is not passed, API will return missing parameter +error to client. + +### Returning errors + +To return an error, call fail method like this: `$this->fail(5, +"error")` (first argument is error code and second is error message). +You can also throw the exception manually: `throw new +APIErrorException("error", 5)` (class: +openvk.VKAPI.Exceptions.APIErrorException). +If you throw any exception that does not inherit APIErrorException then +API will return error №1 (unknown error) to client. + +### Refering to user + +To get user use `getUser` method: `$this->getUser()`. Keep in mind it +will return NULL if user is undefined (no access\_token passed or it is +invalid/expired or roaming authentification failed). +If you need to check whether user is defined use `userAuthorized`. This +method returns true if user is present and false if not. +If your method can’t work without user context call `requireUser` and it +will automatically return unauthorized error. + +### Working with data + +You can use OpenVK models for that. However, **do not** return them +(either you will leak data or JSON conversion will fail). It is better +to create a response object and return it. It is also a good idea to +define a structure in Structures subdirectory. + +Have a lot of fun diff --git a/VKAPI/README.textile b/VKAPI/README.textile deleted file mode 100644 index f212658d..00000000 --- a/VKAPI/README.textile +++ /dev/null @@ -1,31 +0,0 @@ -h1. VK API Compatability layer for OpenVK - -This directory contains VK api handlers, structures and relared exceptions. It is still a work-in-progress functionality. -**Note**: requests to api are routed through openvk.Web.Presenters.VKAPIPresenter, this dir contains only handlers. - -h2. Implementing API methods - -VK API methods have names like this: @example.test@. To implement a method like this you will need to create a class @Example@ in the Handlers subdirectory. This class **must** extend VKAPIHandler and be final. -Next step is to create %test% method. It **must** have a type hint that is not %void%. Everything else is fine, the return value of method will be authomatically converted to JSON and sent back to client. - -h3. Parameters - -Method arguments are parameters. To declare a parameter just create an argument with the same name. You should also provide correct type hints for them. Type conversion is done automatically if possible. If not possible error №1 will be returned. -If parameter is not passed by client then router will pass default value to argument. If there is no default value but argument accepts NULL then NULL will be passed. If NULL is not acceptable, default value is undefined and parameter is not passed, API will return missing parameter error to client. - -h3. Returning errors - -To return an error, call %fail% method like this: @$this->fail(5, "error")@ (first argument is error code and second is error message). You can also throw the exception manually: @throw new APIErrorException("error", 5)@ (class: openvk.VKAPI.Exceptions.APIErrorException). -If you throw any exception that does not inherit APIErrorException then API will return error №1 (unknown error) to client. - -h3. Refering to user - -To get user use @getUser@ method: @$this->getUser()@. Keep in mind it will return NULL if user is undefined (no access_token passed or it is invalid/expired or roaming authentification failed). -If you need to check whether user is defined use @userAuthorized@. This method returns true if user is present and false if not. -If your method can't work without user context call @requireUser@ and it will automatically return unauthorized error. - -h3. Working with data - -You can use OpenVK models for that. However, **do not** return them (either you will leak data or JSON conversion will fail). It is better to create a response object and return it. It is also a good idea to define a structure in Structures subdirectory. - -Have a lot of fun ^^ From b7559dcfe802ebd41178300cba88ef0f41a8e249 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko <50026114+maksalees@users.noreply.github.com> Date: Mon, 7 Feb 2022 22:01:23 +0200 Subject: [PATCH 27/38] L10n (English): Add some strings from Russian --- locales/en.strings | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/locales/en.strings b/locales/en.strings index b4a97cd3..53d1428e 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -314,7 +314,7 @@ "note" = "Note"; "name_note" = "Title"; "text_note" = "Content"; -"create_note" = "Create note"; +"create_note" = "Add note"; "edit_note" = "Edit note"; "actions" = "Actions"; @@ -325,6 +325,10 @@ "notes_other" = "$1 notes"; "notes_start_screen" = "With notes, you can share your events with friends and see what's going on with them."; +"notes_list_zero" = "No notes found"; +"notes_list_one" = "$1 note found"; +"notes_list_other" = "$1 notes found"; + /* Menus */ /* Note that is string need to fit into the "My Page" link */ From 13b614c3774c335487158c37b726efd6e43c083a Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Mon, 7 Feb 2022 23:20:55 +0200 Subject: [PATCH 28/38] Users: Add the ability to convert votes into a rating for yourself or other users Closes #345 --- .../CoinsTransferNotification.php | 2 +- .../Notifications/RatingUpNotification.php | 13 ++++ Web/Presenters/UserPresenter.php | 42 ++++++++++- Web/Presenters/templates/User/View.xml | 3 + .../components/notifications/9603/_18_18_.xml | 8 ++ Web/routes.yml | 2 + Web/static/js/openvk.cls.js | 75 +++++++++++++++++++ locales/en.strings | 15 ++++ locales/ru.strings | 15 ++++ 9 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 Web/Models/Entities/Notifications/RatingUpNotification.php create mode 100644 Web/Presenters/templates/components/notifications/9603/_18_18_.xml diff --git a/Web/Models/Entities/Notifications/CoinsTransferNotification.php b/Web/Models/Entities/Notifications/CoinsTransferNotification.php index d515631a..2cfc5230 100644 --- a/Web/Models/Entities/Notifications/CoinsTransferNotification.php +++ b/Web/Models/Entities/Notifications/CoinsTransferNotification.php @@ -1,6 +1,6 @@ flashFail("succ", tr("information_-1"), tr("points_transfer_successful", tr("points_amount", $value), $receiver->getURL(), htmlentities($receiver->getCanonicalName()))); } + + function renderIncreaseRating(): void + { + $this->assertUserLoggedIn(); + $this->willExecuteWriteAction(); + + if(!OPENVK_ROOT_CONF["openvk"]["preferences"]["commerce"]) + $this->flashFail("err", tr("error"), tr("feature_disabled")); + + $receiverAddress = $this->postParam("receiver"); + $value = (int) $this->postParam("value"); + $message = $this->postParam("message"); + + if(!$receiverAddress || !$value) + $this->flashFail("err", tr("failed_to_increase_rating"), tr("not_all_information_has_been_entered")); + + if($value < 0) + $this->flashFail("err", tr("failed_to_increase_rating"), tr("negative_rating_value")); + + if(iconv_strlen($message) > 255) + $this->flashFail("err", tr("failed_to_increase_rating"), tr("message_is_too_long")); + + $receiver = $this->users->getByAddress($receiverAddress); + if(!$receiver) + $this->flashFail("err", tr("failed_to_increase_rating"), tr("receiver_not_found")); + + if($this->user->identity->getCoins() < $value) + $this->flashFail("err", tr("failed_to_increase_rating"), tr("you_dont_have_enough_points")); + + $this->user->identity->setCoins($this->user->identity->getCoins() - $value); + $this->user->identity->save(); + + $receiver->setRating($receiver->getRating() + $value); + $receiver->save(); + + if($this->user->id !== $receiver->getId()) + (new RatingUpNotification($receiver, $this->user->identity, $value, $message))->emit(); + + $this->flashFail("succ", tr("information_-1"), tr("rating_increase_successful", $receiver->getURL(), htmlentities($receiver->getCanonicalName()), $value)); + } } diff --git a/Web/Presenters/templates/User/View.xml b/Web/Presenters/templates/User/View.xml index 6a7dfb9e..f421925c 100644 --- a/Web/Presenters/templates/User/View.xml +++ b/Web/Presenters/templates/User/View.xml @@ -72,6 +72,9 @@ + {else} {if $thisUser->getChandlerUser()->can("substitute")->model('openvk\Web\Models\Entities\User')->whichBelongsTo(0)} diff --git a/Web/Presenters/templates/components/notifications/9603/_18_18_.xml b/Web/Presenters/templates/components/notifications/9603/_18_18_.xml new file mode 100644 index 00000000..a139ccb7 --- /dev/null +++ b/Web/Presenters/templates/components/notifications/9603/_18_18_.xml @@ -0,0 +1,8 @@ +{var sender = $notification->getModel(1)} +{var value = (int) explode(" ", $notification->getData(), 2)[0]} +{var message = explode(" ", $notification->getData(), 2)[1]} + +{$sender->getCanonicalName()} {_increased_your_rating_by} {$value}%. +{if !empty($message)} + {_message}: "{$message}". +{/if} diff --git a/Web/routes.yml b/Web/routes.yml index 65d1df1f..bd682782 100644 --- a/Web/routes.yml +++ b/Web/routes.yml @@ -73,6 +73,8 @@ routes: handler: "User->disableTwoFactorAuth" - url: "/coins_transfer" handler: "User->coinsTransfer" + - url: "/increase_social_credits" + handler: "User->increaseRating" - url: "/id{num}" handler: "User->view" - url: "/friends{num}" diff --git a/Web/static/js/openvk.cls.js b/Web/static/js/openvk.cls.js index 8d600715..77677191 100644 --- a/Web/static/js/openvk.cls.js +++ b/Web/static/js/openvk.cls.js @@ -289,3 +289,78 @@ function supportFastAnswerDialogOnClick(answer) { answerInput.value = answer; answerInput.focus(); } + +function ovk_proc_strtr(string, length = 0) { + const newString = string.substring(0, length); + return newString + (string !== newString ? "…" : ""); +} + +function showIncreaseRatingDialog(coinsCount, userUrl, hash) { + MessageBox(tr("increase_rating"), ` +
+ ${tr("you_have_unused_votes", coinsCount)}
+ ${tr("apply_voucher")} » +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ ${tr("to_whom")}: + + +
+ ${tr("increase_by")}: + + +
+ ${tr("message")}: + + +
+
+
+ ${tr("price")}: + + ${tr("points_amount", 0)} (1% = ${tr("points_amount_one", 1)}) +
+ +
+ `, [tr("increase_rating_button"), tr("cancel")], [ + () => { + document.querySelector("#increase_rating_form").submit(); + }, + Function.noop + ]); + + document.querySelector("#value_input").oninput = function () { + let value = Number(this.value); + value = isNaN(value) ? "?" : ovk_proc_strtr(String(value), 7); + if(!value.endsWith("…") && value != "?") + value = Number(value); + + if(typeof value === "number") + document.querySelector("#rating_price").innerHTML = tr("points_amount", value); + else + document.querySelector("#rating_price").innerHTML = value + " " + tr("points_amount_other").replace("$1 ", ""); + }; +} diff --git a/locales/en.strings b/locales/en.strings index 53d1428e..c649d40b 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -583,6 +583,21 @@ "receiver_not_found" = "The receiver was not found."; "you_dont_have_enough_points" = "You don't have enough votes."; +"increase_rating" = "Increase rating"; +"increase_rating_button" = "Increase"; +"to_whom" = "To whom"; +"increase_by" = "Increase by"; +"price" = "Price"; + +"you_have_unused_votes" = "You have $1 unused votes on your balance."; +"apply_voucher" = "Apply voucher"; + +"failed_to_increase_rating" = "Failed to increase rating"; +"rating_increase_successful" = "You have successfully increased rating of $2 by $3%."; +"negative_rating_value" = "We cannot steal rating from another person, sorry."; + +"increased_your_rating_by" = "increased your rating by"; + /* Gifts */ "gift" = "Gift"; diff --git a/locales/ru.strings b/locales/ru.strings index ce456b6c..ae9a2098 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -609,6 +609,21 @@ "receiver_not_found" = "Получатель не найден."; "you_dont_have_enough_points" = "У вас недостаточно голосов."; +"increase_rating" = "Повысить рейтинг"; +"increase_rating_button" = "Повысить"; +"to_whom" = "Кому"; +"increase_by" = "Повысить на"; +"price" = "Стоимость"; + +"you_have_unused_votes" = "У Вас $1 неиспользованных голоса на балансе."; +"apply_voucher" = "Применить ваучер"; + +"failed_to_increase_rating" = "Не удалось повысить рейтинг"; +"rating_increase_successful" = "Вы успешно повысыли рейтинг $2 на $3%."; +"negative_rating_value" = "Мы не можем украсть рейтинг у другого человека, извините."; + +"increased_your_rating_by" = "повысил ваш рейтинг на"; + /* Gifts */ "gift" = "Подарок"; From 725bbf2b35832dbc02cb7edda1a606f2b6f2513e Mon Sep 17 00:00:00 2001 From: lvl <90154880+apeeh@users.noreply.github.com> Date: Tue, 8 Feb 2022 11:05:18 +0400 Subject: [PATCH 29/38] AM strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "недоперевод" исправлен --- locales/am.strings | 1 + 1 file changed, 1 insertion(+) diff --git a/locales/am.strings b/locales/am.strings index b77f4c3a..4c5b412e 100644 --- a/locales/am.strings +++ b/locales/am.strings @@ -245,6 +245,7 @@ "role" = "Դեր"; "administrator" = "Ադմինիստրատոր"; "promote_to_admin" = "Բարձրացնել դեպի ադմինիստրատոր"; +"promote_to_owner" = "Դարձնել տեր"; "devote" = "Հետ բողոքարկել"; "group_allow_post_for_everyone" = "Թույլ տար գրություններ թողնել բոլորին"; "set_comment" = "Փոփոխել մեկնաբանությունը"; From 881665831ef4b3ef0a18abdf6b8ed08f302ba02b Mon Sep 17 00:00:00 2001 From: celestora Date: Tue, 8 Feb 2022 12:15:29 +0200 Subject: [PATCH 30/38] Allow non-cased letters in names --- Web/Models/Entities/User.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index 1161cbb6..64b689e4 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -743,7 +743,7 @@ class User extends RowModel function setFirst_Name(string $firstName): void { $firstName = mb_convert_case($firstName, MB_CASE_TITLE); - if(!preg_match('%^\p{Lu}\p{Mn}?(?:\p{L&}\p{Mn}?){1,16}$%u', $firstName)) + if(!preg_match('%^[\p{Lu}\p{Lo}]\p{Mn}?(?:[\p{L&}\p{Lo}]\p{Mn}?){1,16}$%u', $firstName)) throw new InvalidUserNameException; $this->stateChanges("first_name", $firstName); @@ -754,7 +754,7 @@ class User extends RowModel if(!empty($lastName)) { $lastName = mb_convert_case($lastName, MB_CASE_TITLE); - if(!preg_match('%^\p{Lu}\p{Mn}?(\p{L&}\p{Mn}?){1,16}(\-\g<1>+)?$%u', $lastName)) + if(!preg_match('%^[\p{Lu}\p{Lo}]\p{Mn}?([\p{L&}\p{Lo}]\p{Mn}?){1,16}(\-\g<1>+)?$%u', $lastName)) throw new InvalidUserNameException; } From 5f376b051780885ca0ebb54a7727e040f6a4595a Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Tue, 8 Feb 2022 15:44:20 +0200 Subject: [PATCH 31/38] Users: Consider nickname when searching for a user Closes #465 --- Web/Models/Repositories/Users.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Models/Repositories/Users.php b/Web/Models/Repositories/Users.php index e0893a6d..66f9f5ae 100644 --- a/Web/Models/Repositories/Users.php +++ b/Web/Models/Repositories/Users.php @@ -39,7 +39,7 @@ class Users function find(string $query): Util\EntityStream { $query = "%$query%"; - $result = $this->users->where("CONCAT_WS(' ', first_name, last_name) LIKE ?", $query)->where("deleted", 0); + $result = $this->users->where("CONCAT_WS(' ', first_name, last_name, pseudo) LIKE ?", $query)->where("deleted", 0); return new Util\EntityStream("User", $result); } From 95de8e4514768db4db972c53971e7e405550166c Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Tue, 8 Feb 2022 18:28:51 +0200 Subject: [PATCH 32/38] Wall: Process hashtags only if it's not part of a word Closes #449 --- Web/Models/Entities/Traits/TRichText.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Web/Models/Entities/Traits/TRichText.php b/Web/Models/Entities/Traits/TRichText.php index 07caacdc..3eaaeaff 100644 --- a/Web/Models/Entities/Traits/TRichText.php +++ b/Web/Models/Entities/Traits/TRichText.php @@ -64,7 +64,7 @@ trait TRichText $text = preg_replace("%@([A-Za-z0-9]++) \(([\p{L} 0-9]+)\)%Xu", "[$1|$2]", $text); $text = preg_replace("%([\n\r\s]|^)(@([A-Za-z0-9]++))%Xu", "$1[$3|@$3]", $text); $text = preg_replace("%\[([A-Za-z0-9]++)\|([\p{L} 0-9@]+)\]%Xu", "$2", $text); - $text = preg_replace("%(#([\p{L}_-]++[0-9]*[\p{L}_-]*))%Xu", "$1", $text); + $text = preg_replace("%([\n\r\s]|^)(#([\p{L}_-]++[0-9]*[\p{L}_-]*))%Xu", "$1$2", $text); $text = $this->formatEmojis($text); } From a15a78b8f0599f24c0b63ec9b3c258f885d0fb15 Mon Sep 17 00:00:00 2001 From: Maxim Leshchenko Date: Wed, 9 Feb 2022 21:36:41 +0200 Subject: [PATCH 33/38] L10n: Translate message strings in WallPresenter --- Web/Presenters/WallPresenter.php | 32 ++++++++++++++++---------------- locales/en.strings | 8 ++++++++ locales/ru.strings | 8 ++++++++ 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php index bf5a5b8d..98e8a4cd 100644 --- a/Web/Presenters/WallPresenter.php +++ b/Web/Presenters/WallPresenter.php @@ -45,7 +45,7 @@ final class WallPresenter extends OpenVKPresenter function renderWall(int $user, bool $embedded = false): void { if(false) - exit("Ошибка доступа: " . (string) random_int(0, 255)); + exit(tr("forbidden") . ": " . (string) random_int(0, 255)); $owner = ($user < 0 ? (new Clubs) : (new Users))->get(abs($user)); if(is_null($this->user)) { @@ -54,7 +54,7 @@ final class WallPresenter extends OpenVKPresenter if(!$owner->isBanned()) $canPost = $owner->getPrivacyPermission("wall.write", $this->user->identity); else - $this->flashFail("err", tr("error"), "Ошибка доступа"); + $this->flashFail("err", tr("error"), tr("forbidden")); } else if($user < 0) { if($owner->canBeModifiedBy($this->user->identity)) $canPost = true; @@ -89,7 +89,7 @@ final class WallPresenter extends OpenVKPresenter function renderRSS(int $user): void { if(false) - exit("Ошибка доступа: " . (string) random_int(0, 255)); + exit(tr("forbidden") . ": " . (string) random_int(0, 255)); $owner = ($user < 0 ? (new Clubs) : (new Users))->get(abs($user)); if(is_null($this->user)) { @@ -98,7 +98,7 @@ final class WallPresenter extends OpenVKPresenter if(!$owner->isBanned()) $canPost = $owner->getPrivacyPermission("wall.write", $this->user->identity); else - $this->flashFail("err", tr("error"), "Ошибка доступа"); + $this->flashFail("err", tr("error"), tr("forbidden")); } else if($user < 0) { if($owner->canBeModifiedBy($this->user->identity)) $canPost = true; @@ -213,12 +213,12 @@ final class WallPresenter extends OpenVKPresenter $this->willExecuteWriteAction(); $wallOwner = ($wall > 0 ? (new Users)->get($wall) : (new Clubs)->get($wall * -1)) - ?? $this->flashFail("err", "Не удалось опубликовать пост", "Такого пользователя не существует."); + ?? $this->flashFail("err", tr("failed_to_publish_post"), tr("error_4")); if($wall > 0) { if(!$wallOwner->isBanned()) $canPost = $wallOwner->getPrivacyPermission("wall.write", $this->user->identity); else - $this->flashFail("err", "Ошибка доступа", "Вам нельзя писать на эту стену."); + $this->flashFail("err", tr("not_enough_permissions"), tr("not_enough_permissions_comment")); } else if($wall < 0) { if($wallOwner->canBeModifiedBy($this->user->identity)) $canPost = true; @@ -229,7 +229,7 @@ final class WallPresenter extends OpenVKPresenter } if(!$canPost) - $this->flashFail("err", "Ошибка доступа", "Вам нельзя писать на эту стену."); + $this->flashFail("err", tr("not_enough_permissions"), tr("not_enough_permissions_comment")); $anon = OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["anonymousPosting"]["enable"]; if($wallOwner instanceof Club && $this->postParam("as_group") === "on" && $this->postParam("force_sign") !== "on" && $anon) { @@ -263,13 +263,13 @@ final class WallPresenter extends OpenVKPresenter $video = Video::fastMake($this->user->id, $this->postParam("text"), $_FILES["_vid_attachment"], $anon); } } catch(\DomainException $ex) { - $this->flashFail("err", "Не удалось опубликовать пост", "Файл медиаконтента повреждён."); + $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted")); } catch(ISE $ex) { - $this->flashFail("err", "Не удалось опубликовать пост", "Файл медиаконтента повреждён или слишком велик."); + $this->flashFail("err", tr("failed_to_publish_post"), tr("media_file_corrupted_or_too_large")); } if(empty($this->postParam("text")) && !$photo && !$video) - $this->flashFail("err", "Не удалось опубликовать пост", "Пост пустой или слишком большой."); + $this->flashFail("err", tr("failed_to_publish_post"), tr("post_is_empty_or_too_big")); try { $post = new Post; @@ -282,7 +282,7 @@ final class WallPresenter extends OpenVKPresenter $post->setNsfw($this->postParam("nsfw") === "on"); $post->save(); } catch (\LengthException $ex) { - $this->flashFail("err", "Не удалось опубликовать пост", "Пост слишком большой."); + $this->flashFail("err", tr("failed_to_publish_post"), tr("post_is_too_big")); } if(!is_null($photo)) @@ -316,7 +316,7 @@ final class WallPresenter extends OpenVKPresenter $this->template->wallOwner = (new Users)->get($post->getTargetWall()); $this->template->isWallOfGroup = false; if($this->template->wallOwner->isBanned()) - $this->flashFail("err", tr("error"), "Ошибка доступа"); + $this->flashFail("err", tr("error"), tr("forbidden")); } else { $this->template->wallOwner = (new Clubs)->get(abs($post->getTargetWall())); $this->template->isWallOfGroup = true; @@ -380,7 +380,7 @@ final class WallPresenter extends OpenVKPresenter $user = $this->user->id; $wallOwner = ($wall > 0 ? (new Users)->get($wall) : (new Clubs)->get($wall * -1)) - ?? $this->flashFail("err", "Не удалось удалить пост", "Такого пользователя не существует."); + ?? $this->flashFail("err", tr("failed_to_delete_post"), tr("error_4")); if($wall < 0) $canBeDeletedByOtherUser = $wallOwner->canBeModifiedBy($this->user->identity); else $canBeDeletedByOtherUser = false; @@ -391,7 +391,7 @@ final class WallPresenter extends OpenVKPresenter $post->delete(); } } else { - $this->flashFail("err", "Не удалось удалить пост", "Вы не вошли в аккаунт."); + $this->flashFail("err", tr("failed_to_delete_post"), tr("login_required_error_comment")); } $this->redirect($wall < 0 ? "/club".($wall*-1) : "/id".$wall, static::REDIRECT_TEMPORARY); @@ -408,7 +408,7 @@ final class WallPresenter extends OpenVKPresenter $this->notFound(); if(!$post->canBePinnedBy($this->user->identity)) - $this->flashFail("err", "Ошибка доступа", "Вам нельзя закреплять этот пост."); + $this->flashFail("err", tr("not_enough_permissions"), tr("not_enough_permissions_comment")); if(($this->queryParam("act") ?? "pin") === "pin") { $post->pin(); @@ -417,6 +417,6 @@ final class WallPresenter extends OpenVKPresenter } // TODO localize message based on language and ?act=(un)pin - $this->flashFail("succ", "Операция успешна", "Операция успешна."); + $this->flashFail("succ", tr("information_-1"), tr("changes_saved_comment")); } } diff --git a/locales/en.strings b/locales/en.strings index c649d40b..a888dd54 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -800,6 +800,14 @@ "captcha_error" = "Incorrect characters entered"; "captcha_error_comment" = "Please make sure you fill in the captcha field correctly."; +"failed_to_publish_post" = "Failed to publish post"; +"failed_to_delete_post" = "Failed to delete post"; + +"media_file_corrupted" = "The media content file is corrupted."; +"media_file_corrupted_or_too_large" = "The media content file is corrupted or too large."; +"post_is_empty_or_too_big" = "The post is empty or too big."; +"post_is_too_big" = "The post is too big."; + /* Admin actions */ "login_as" = "Login as $1"; diff --git a/locales/ru.strings b/locales/ru.strings index ae9a2098..3782b4f4 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -837,6 +837,14 @@ "captcha_error" = "Неправильно введены символы"; "captcha_error_comment" = "Пожалуйста, убедитесь, что вы правильно заполнили поле с капчей."; +"failed_to_publish_post" = "Не удалось опубликовать пост"; +"failed_to_delete_post" = "Не удалось удалить пост"; + +"media_file_corrupted" = "Файл медиаконтента повреждён."; +"media_file_corrupted_or_too_large" = "Файл медиаконтента повреждён или слишком велик."; +"post_is_empty_or_too_big" = "Пост пустой или слишком большой."; +"post_is_too_big" = "Пост слишком большой."; + /* Admin actions */ "login_as" = "Войти как $1"; From 89f68076487066c4251755d9d3a091f1a34850cb Mon Sep 17 00:00:00 2001 From: Alexander Minkin Date: Wed, 9 Feb 2022 23:17:57 +0300 Subject: [PATCH 34/38] Wall: add "object-fit: cover" to .cCompactAvatars Fixes distortion with squared avatars enabled. --- Web/static/css/avatar.1.css | 1 + Web/static/css/avatar.2.css | 1 + 2 files changed, 2 insertions(+) diff --git a/Web/static/css/avatar.1.css b/Web/static/css/avatar.1.css index 465cb4ff..6103cefb 100644 --- a/Web/static/css/avatar.1.css +++ b/Web/static/css/avatar.1.css @@ -38,4 +38,5 @@ div.content > table:nth-child(1) > tbody:nth-child(1) > tr:nth-child(1) > td:nth .cCompactAvatars { width: 30px !important; height: 30px !important; + object-fit: cover; } diff --git a/Web/static/css/avatar.2.css b/Web/static/css/avatar.2.css index 4602c012..b4328ddf 100644 --- a/Web/static/css/avatar.2.css +++ b/Web/static/css/avatar.2.css @@ -65,4 +65,5 @@ div.ovk-video > div > img .cCompactAvatars { width: 30px !important; height: 30px !important; + object-fit: cover; } From 2fe02c71c209181d78434855b1c7fde2785e5ccd Mon Sep 17 00:00:00 2001 From: Alexander Minkin Date: Wed, 9 Feb 2022 23:26:10 +0300 Subject: [PATCH 35/38] L10n: Fix "Avatar style" section --- locales/en.strings | 6 +++--- locales/ru.strings | 8 ++++---- locales/ru_old.strings | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/locales/en.strings b/locales/en.strings index a888dd54..e96cb9d8 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -393,9 +393,9 @@ "avatars_style" = "Avatar style"; "style" = "Style"; -"default" = "Default"; -"cut" = "Cut"; -"round_avatars" = "Round avatars"; +"default" = "Arbitrary (default)"; +"cut" = "Square"; +"round_avatars" = "Round"; "apply_style_for_this_device" = "Apply style only for this device"; diff --git a/locales/ru.strings b/locales/ru.strings index 3782b4f4..0f03256e 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -410,12 +410,12 @@ "new_password" = "Новый пароль"; "repeat_password" = "Повторите пароль"; -"avatars_style" = "Отображение аватар"; +"avatars_style" = "Отображение аватаров"; "style" = "Стиль"; -"default" = "По умолчанию"; -"cut" = "Обрезка"; -"round_avatars" = "Круглый аватар"; +"default" = "Произвольные (по умолчанию)"; +"cut" = "Квадратные"; +"round_avatars" = "Круглые"; "apply_style_for_this_device" = "Применить стиль только для этого устройства"; diff --git a/locales/ru_old.strings b/locales/ru_old.strings index dbafdab3..19fd9c45 100644 --- a/locales/ru_old.strings +++ b/locales/ru_old.strings @@ -364,9 +364,9 @@ "avatars_style" = "Отображеніе портрета"; "style" = "Стиль"; -"default" = "По умолчанію"; -"cut" = "Обрѣзка"; -"round_avatars" = "Круглый портретъ"; +"default" = "Произвольный (по умолчанію)"; +"cut" = "Квадратные​"; +"round_avatars" = "Круглые"; "search_for_groups" = "Поискъ обществъ"; "search_for_people" = "Поискъ людей"; From d23a9f704caf903912c6343372e8dc944d9c877a Mon Sep 17 00:00:00 2001 From: ayaao <58212796+ayaaop@users.noreply.github.com> Date: Thu, 10 Feb 2022 23:08:51 +0600 Subject: [PATCH 36/38] L10n: Kazakh: add new strings (#472) New strings for kk_KZ: notes_start_screen, notes_list_zero, notes_list_one, notes_list_other, increase_rating, increase_rating_button, to_whom, increase_by, price, you_have_unused_votes, apply_voucher, failed_to_increase_rating, rating_increase_successful, negative_rating_value, increased_your_rating_by, failed_to_publish_post, failed_to_delete_post, media_file_corrupted, media_file_corrupted_or_too_large, post_is_empty_or_too_big, post_is_too_big. Updated strings negative_transfer_value, round_avatars, cut, default, avatars_style --- locales/kk.strings | 38 +++++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/locales/kk.strings b/locales/kk.strings index a90bbba4..e1ef061a 100644 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -327,6 +327,11 @@ "notes_zero" = "Жолжазбалар жоқ"; "notes_one" = "$1 жолжазба"; "notes_other" = "$1 жолжазба"; +"notes_start_screen" = "Жолжазбалар арқылы оқиғаларды достарыңызбен бөлісуге және олармен не болып жатқанын көруге болады."; + +"notes_list_zero" = "Еш жолжазба табылған жоқ"; +"notes_list_one" = "$1 жолжазба табылды"; +"notes_list_other" = "$1 жолжазба табылды"; /* Menus */ @@ -387,12 +392,12 @@ "new_password" = "Жаңа құпиясөз"; "repeat_password" = "Қайталап жазыңызшы"; -"avatars_style" = "Аватар стилі"; +"avatars_style" = "Аватарлардың стилі"; "style" = "Стилі"; -"default" = "Әдепкі"; -"cut" = "Кесілген"; -"round_avatars" = "Дөңгелектелген"; +"default" = "Ерікті (әдепкі)"; +"cut" = "Шаршы"; +"round_avatars" = "Дөңгелек"; "apply_style_for_this_device" = "Стильді тек осы девайс үшін қосу"; @@ -573,11 +578,26 @@ "points_transfer_successful" = "Сіз сәтті $1 $3 аталатын пайдаланушыға аудардыңыз."; "not_all_information_has_been_entered" = "Барлық мәлімет терілген жоқ"; -"negative_transfer_value" = "Өкінішке орай біз басқа кісіден дауыс ұрлай алмаймыз."; +"negative_transfer_value" = "Кешіріңіз, бірақ біз басқа адамнан дауыс ұрлай алмаймыз."; "message_is_too_long" = "Хабар тым ұзын."; "receiver_not_found" = "Қабылдаушы табылған жоқ."; "you_dont_have_enough_points" = "Сізде жеткілікті дауыс саны жоқ."; +"increase_rating" = "Рейтингті көтеру"; +"increase_rating_button" = "Көтеру"; +"to_whom" = "Кімге"; +"increase_by" = "Неше есе көтеру"; +"price" = "Бағасы"; + +"you_have_unused_votes" = "Сіздің шотыңызда $1 қолданылмаған дауыс бар."; +"apply_voucher" = "Ваучерді қолдану"; + +"failed_to_increase_rating" = "Рейтингті көтеру мүмкін болмады"; +"rating_increase_successful" = "Сіз $2 атты пайдаланушының рейтингің сәтті $3% есе көтердіңіз."; +"negative_rating_value" = "Кешіріңіз, бірақ біз басқа адамның рейтингің ұрлай алмаймыз."; + +"increased_your_rating_by" = "сіздің рейтингіңізді көтерді"; + /* Gifts */ "gift" = "Сыйлық"; @@ -778,6 +798,14 @@ "captcha_error" = "Қате таңбалар енгізілді"; "captcha_error_comment" = "Капча өрісін дұрыс толтырғаныңызға көз жеткізіңіз."; +"failed_to_publish_post" = "Постты жариялау мүмкін болмады"; +"failed_to_delete_post" = "Постты жоюға мүмкін болмады"; + +"media_file_corrupted" = "Медиа мазмұн файлы бүлінген."; +"media_file_corrupted_or_too_large" = "Медиа мазмұн файлы бүлінген немесе тым үлкен."; +"post_is_empty_or_too_big" = "Жазбаңызда түк те жоқ немесе ол тым үлкен."; +"post_is_too_big" = "Жазбаңыз тым үлкен."; + /* Admin actions */ "login_as" = "$1 ретінде кіру"; From a24af125b33282446353ee856a71c3ea8782717c Mon Sep 17 00:00:00 2001 From: ayaao <58212796+ayaaop@users.noreply.github.com> Date: Thu, 10 Feb 2022 23:22:51 +0600 Subject: [PATCH 37/38] L10n: Kazakh: hotfix (#473) New strings for kk_KZ: friends_add Updated strings for kk_KZ: friends_reject (wrong translation) --- locales/kk.strings | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/locales/kk.strings b/locales/kk.strings index e1ef061a..571301b5 100644 --- a/locales/kk.strings +++ b/locales/kk.strings @@ -198,7 +198,8 @@ "follower" = "Жазылман"; "login_as" = "Кім ретінде кіру:"; "friends_delete" = "Достарымнан жою"; -"friends_reject" = "Өтінімді қабылдамау"; +"friends_add" = "Достарыма қосу"; +"friends_reject" = "Өтінімнен бас тарту"; "friends_accept" = "Өтінімді қабылдау"; "send_message" = "Хабарлама жазу"; "incoming_req" = "Жазылушылар"; From 02eacdb84a8d87ac1aee70b5e43ed70053f43291 Mon Sep 17 00:00:00 2001 From: Ilya Prokopenko Date: Fri, 11 Feb 2022 07:19:18 +0300 Subject: [PATCH 38/38] Posts: Remove "Report" button This commit removes the Report button. When the feature-reports branch is finished and merged with the main branch, the button will return to its place. --- Web/Presenters/templates/Wall/Post.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/Web/Presenters/templates/Wall/Post.xml b/Web/Presenters/templates/Wall/Post.xml index 4699c491..d98f8033 100644 --- a/Web/Presenters/templates/Wall/Post.xml +++ b/Web/Presenters/templates/Wall/Post.xml @@ -31,6 +31,5 @@ {/if} {_delete} - {_report} {/block}