github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 23:23:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
325 Commits 85 Branches 50 Tags 181 MiB
b2704c3929
Commit Graph

325 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
StoneSoldier
4cbb914cdc flagged_by text grammar fix (#103) 
* flagged_by text grammar fix

changed "{username} flagged" to "Flagged by {username}" and "{username}
flagged as {reason}" to "{username} flagged this as {reason}"

* changed to "Flagged by {username} as {reason}"
 2017-05-10 20:47:09 +02:00
Toby Zerner
3099122852 Merge pull request #101 from milescellar/patch-7 
Update description of filled rule
 2017-03-06 07:42:32 +10:30
Miles Cellar
ec5059221e Update description of filled rule 
Source: 90886732cf
 2017-03-05 20:31:55 +01:00
Franz Liedke
e33a7b94ab Merge pull request #100 from milescellar/patch-6 
Add "Rename" to the reused translations
 2017-03-03 08:46:20 +01:00
Miles Cellar
35db9d7294 Add "Rename" to the reused translations 
Just because there are now two references of it.
 2017-03-02 16:41:15 +01:00
Franz Liedke
cf82c04525 Fix nesting of rename_discussion translations 
Refs #98.
 2017-02-28 22:39:33 +01:00
Franz Liedke
e7b794b55b Rename translation key 2017-02-26 23:47:11 +01:00
Franz Liedke
c6382eecee Merge pull request #98 from wiwatsrt/Patch-1 
Rename discussion modal translations
 2017-02-26 23:36:36 +01:00
Franz Liedke
0f055a4c17 Merge pull request #99 from janga1997/patch-1 
Hide diff for compiled diff files
 2017-02-20 16:18:13 +01:00
VSN Reddy Janga
7e84ed7e3c Hide diff for compiled diff files 2017-02-20 19:45:45 +05:30
Wiwat Srisattha
3e4b9f40bd Remove unnecessary double quotes 2017-02-19 09:02:29 +07:00
Wiwat Srisattha
f39e2b1ee2 Rename discussion modal translations 2017-02-19 08:56:43 +07:00
Franz Liedke
080379e230 Merge pull request #92 from renyuneyun/master 
add missing translations (for EditUserModal.js)
 2017-02-03 17:22:00 +01:00
Franz Liedke
af49f339ca Merge pull request #93 from milescellar/patch-2 
Add missing translation
 2017-01-03 21:02:24 +01:00
Franz Liedke
5b734aa1c8 Merge pull request #96 from milescellar/patch-4 
Update year
 2017-01-02 20:04:07 +01:00
Miles Cellar
2ed9a70ed2 Update year 2017-01-01 22:41:58 +01:00
renyuneyun
d2d7827caf add missing translations (for EditUserModal.js) 2016-12-28 21:57:52 +00:00
Miles Cellar
42d4a3c970 Add missing translation 
Associated with: https://github.com/flarum/core/pull/1094
 2016-12-27 01:56:02 +01:00
Toby Zerner
1076a00c86 Merge pull request #90 from milescellar/patch-1 
Add language lines for before_or_equal and after_or_equal
 2016-12-03 09:22:28 +10:30
Miles Cellar
de19cc9d55 Add language lines for before_or_equal and after_or_equal 
See: fa1eae35b9
 2016-12-02 17:58:09 +01:00
Toby Zerner
b42cb064dc Merge pull request #86 from sijad/patch-1 
Add remember me label
 2016-11-29 18:36:21 +10:30
Sajjad Hashemian
6822ffb26f Add remember me label 2016-11-29 11:31:45 +03:30
Toby Zerner
c90932071c Move username validation message for specificity 2016-11-27 19:41:18 +10:30
Toby Zerner
79711963fd v0.1.0-beta.6 2016-10-19 21:13:02 +10:30
Toby Zerner
508eac2380 Merge pull request #85 from maelsoucaze/patch-1 
Update to the latest Laravel version
 2016-09-27 06:28:00 +09:30
Maël
619533fac2 Update to the latest Laravel version 
Laravel's related commits: 537b6288fb dd1e64a7a4 1562407562 and 7da6edf8c1
 2016-09-26 22:07:28 +02:00
Maël Soucaze
dd2376e42f Add language line for file validation rule. (#83) 
See: cd03204044
 2016-07-05 23:47:32 +09:00
dcsjapan
f72295634b Move attributes to validation 
- Moves attributes added in #79 to `validation.yml`.
- See flarum/core#973.
- `SaveTagsToDatabase.php` need to be revised to use these phrases.
- Caution: key names have been changed as well!
 2016-06-04 23:30:54 +09:00
Toby Zerner
619698f755 Merge pull request #81 from maelsoucaze/patch-4 
Quote strings with special or reserved characters
 2016-06-04 22:50:11 +09:30
Maël Soucaze
ec00660cba Quote strings with special or reserved characters 
These strings contain commas and should be quoted.
Source: http://symfony.com/doc/current/components/yaml/yaml_format.html#strings
 2016-06-04 14:57:57 +02:00
Toby Zerner
fcc4c9d258 Merge pull request #80 from dcsjapan/rename-key 
Adjust ID key name and move API key
 2016-06-04 18:59:50 +09:30
dcsjapan
ae3fab8a34 Adjust ID key name and move API key 
- Adjusts the key for the "Follow after reply" setting.
- Supports flarum/flarum-ext-subscriptions/pull/10.
- Moves `api` section below `views`.
 2016-06-04 18:26:46 +09:00
Toby Zerner
4a744b1dbd Add new translations for admin Appearance page 2016-06-04 18:45:12 +09:30
Toby Zerner
7e0ce33d81 Merge pull request #79 from dcsjapan/extract-errors 
Add translations for API error messages
 2016-06-04 17:14:09 +09:30
dcsjapan
c67c7bf638 Add translations for API error messages 
- Adds `:attribute` values for use in `validation.between.numeric`.
- Partially solves flarum/core/#973.
- Code needs to be revised to use these phrases.
 2016-06-04 16:07:07 +09:00
Toby Zerner
a4a3185233 Add new translations for flarum-ext-approval 2016-05-27 14:42:31 +09:30
Maël Soucaze
bf31979a59 Remove unnecessary double quotes (#77) 2016-05-23 22:59:16 +09:00
Maël Soucaze
dfd614e6ea Add language line for image dimensions validation rule (#78) 
See: da64a014e7
 2016-05-23 22:59:04 +09:00
Toby Zerner
93c4cd8960 Merge pull request #76 from dcsjapan/misc-cleanup 
Clean up translation keys
 2016-05-21 22:05:51 +09:30
Toby Zerner
cf9e032693 Add translation for "view post IP addresses" permission 2016-05-21 22:03:31 +09:30
dcsjapan
58daef61c3 Clean up translation keys 
- Removes two obsolete keys from the Extensions page.
- Corrects the suffix on a key in the Change Email modal.
- Extracts the title of the Edit User modal.
- Reorders keys in `core.email` namespace.
- Supports flarum/core#964
 2016-05-21 21:32:54 +09:00
Toby Zerner
ae7b67223a Merge pull request #74 from sijad/quote-select 
Add Quote button translation for mentions
 2016-05-21 20:40:59 +09:30
Toby Zerner
93de8f4a7d Change dismiss flag from tooltip into button 2016-05-21 20:28:38 +09:30
Toby Zerner
2c57f74608 Add translation for post "Edited" indicator 2016-05-21 20:28:29 +09:30
Sjjad Hashemian
e4775c6a91 Add Quote button translation for mentions 2016-05-18 11:05:35 +04:30
Maël Soucaze
69a3acdb6d Use existing reused translation keys. (#73) 2016-05-15 18:49:40 +09:00
David Sevilla Martín
9f7c68ffe1 Admin SMTP UI Translations (#72) 
* Added SMTP page & nav translations (includes SMTP on texts)
Changed from mail.* to smtp.* (thanks @dcsjapan)
Added _label to labels (thanks again)

* Making translations with better quality
(comment from @b9a10a1)

* Changed SMTP to Email, some minor changes, organization, some headings, refs...

* Updated ...SMTP page... comment to ...email page...

* updated translation keys to alphabetically, \& added quotes around email_text (thanks @maelsoucaze)

* Wow, so many extra spaces... I don't know when I added them :(

* Changed "adresses" to "addresses"
 2016-05-15 12:01:46 +09:00
Franz Liedke
0a1dc4c52e Translation for avatar upload tooltip 
Refs flarum/core#249.
 2016-04-17 22:34:53 +09:00
Franz Liedke
731bf8338b Merge pull request #71 2016-04-15 21:16:25 +09:00
dcsjapan
18d57e282c Add translatable string for Flags 
- Adds translation for Flags notification.
- Supports flarum/flarum-ext-flags#6.
 2016-04-15 21:15:48 +09:00