Commit Graph

613 Commits

Author SHA1 Message Date
Robin Ward 1ce7a40084 Revert "Merge pull request #677 from kubabrecka/localization_user_actions2"
This reverts commit c3a426930b, reversing
changes made to 9f9072bd9d.
2013-04-09 12:33:32 -04:00
Robin Ward c3a426930b Merge pull request #677 from kubabrecka/localization_user_actions2
move i18n of UserActions to JS-side and make sentences translatable
2013-04-09 09:25:28 -07:00
Robin Ward 9f9072bd9d Merge pull request #673 from windyson2008/patch-2
Update server.zh_CN.yml
2013-04-09 09:22:59 -07:00
Robin Ward bc75663e7b Merge pull request #680 from kubabrecka/cs_update31
cs translation update
2013-04-09 06:29:19 -07:00
Régis Hanol a2967dbf6b keep French l10n up to date 2013-04-09 14:51:40 +02:00
Kuba Brecka 9e796e8acf cs translation update 2013-04-09 11:10:28 +02:00
Neil Lalonde 93f36cdf93 Show which category colors have already been used when creating/editing a category 2013-04-08 18:33:51 -04:00
Sam 1b73ab614e Merge pull request #674 from kubabrecka/cs_update30
cs translation update
2013-04-08 15:17:01 -07:00
Sam 2f14ef4a68 Merge pull request #675 from kubabrecka/en_tos_typofix
English TOS typos
2013-04-08 15:16:02 -07:00
Kuba Brecka 8d927418e8 move i18n of UserActions to JS-side and make sentences translatable 2013-04-08 22:54:08 +02:00
Robin Ward 75aeb9550f Convert a bunch of callbacks to promises 2013-04-08 16:51:03 -04:00
Kuba Brecka b42570b61d English TOS typos 2013-04-08 22:31:44 +02:00
Kuba Brecka 9ee01948c3 cs translation update 2013-04-08 22:28:10 +02:00
Jonas Stendahl 21d3c96fca Updated swedish translations. 2013-04-08 11:03:55 +02:00
windyson2008 12a20f6547 Update server.zh_CN.yml
1.Add tag
2.Fix transtration
2013-04-08 11:22:51 +09:00
Régis Hanol 41b7f741d0 extract hard-coded strings 2013-04-07 18:14:50 +02:00
Robin Ward ade4dd32de Merge pull request #665 from ZogStriP/keep-french-l10n-up-to-date-2013-04-05
keep French l10n up to date
2013-04-06 07:30:15 -07:00
Jeff Atwood 0d26c819a0 better post quote description
blockquote? seriously?
2013-04-06 03:13:24 -07:00
Jeff Atwood b75454219f improve the category definition default copy 2013-04-06 00:52:21 -07:00
Régis Hanol 1793f3e3bb keep French l10n up to date 2013-04-05 23:17:57 +02:00
Robin Ward 72b4f41254 Can change TOS content via site content editor 2013-04-05 15:21:55 -04:00
Robin Ward c41bdc8752 Merge pull request #662 from kubabrecka/en_typos
fix some typos in English strings
2013-04-05 08:20:52 -07:00
Kuba Brecka 6dff266930 cs translation update 2013-04-05 11:31:43 +02:00
Kuba Brecka 920e1dfd24 fix some typos in English strings 2013-04-05 11:31:06 +02:00
Kuba Brecka 5f4b66d1bd replace CRLF with LF 2013-04-05 11:05:03 +02:00
Jeff Atwood efa99eb242 copyedits on Site Content editor help 2013-04-04 22:47:32 -07:00
Jeff Atwood e7499adacc clarify language on enable_private_messages 2013-04-04 22:24:58 -07:00
Jeff Atwood e3b6fc3ec0 trust ranges are 0-4, not 0-5 (moderators diff) 2013-04-04 22:19:13 -07:00
Sam fe434710e1 Merge pull request #647 from windyson2008/patch-1
Update client.zh_CN.yml
2013-04-04 21:40:41 -07:00
Sam 162af29aae Merge pull request #653 from kubabrecka/cs_typos
fix some typos in cs translation
2013-04-04 21:36:31 -07:00
Sam 4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Robin Ward fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Neil Lalonde 66bc48a0e3 Give magic wands to all moderators 2013-04-04 16:14:55 -04:00
Kuba Brecka 53bcf99f57 fix some typos in cs translation 2013-04-04 16:57:54 +02:00
Jeff Atwood cb9370b00c clarify that read tab is in order that you read 2013-04-04 02:06:31 -07:00
windyson2008 d8b6ecef74 Update client.zh_CN.yml
1,Add tag
2,Fix translation
2013-04-04 13:20:45 +09:00
Sam 86cf7b1524 trust level 0 is highlighted in light gray as opposed to having special semantics around account age. 2013-04-04 12:24:23 +11:00
Kuba Brecka 317b884943 cs translation update 2013-04-03 23:22:35 +02:00
Robin Ward 33f349a1e6 Show all Hot rankings at once with a toggle button 2013-04-03 15:25:18 -04:00
Neil Lalonde bb18b6cb9b Dashboard: split out private messages from topic and post counts; re-enable report_spec because I think I fixed it... 2013-04-03 13:26:09 -04:00
Robin Ward ac0bc1bb30 Including your avatar if you've posted is confusing. Let's remove it for now. 2013-04-03 11:29:50 -04:00
Robin Ward 2b9514a311 Merge pull request #627 from kubabrecka/translatable_flags_and_likes
make post actions (likes, flags) translatable as whole sentences
2013-04-03 08:09:13 -07:00
Robin Ward f7a4b82a53 Minor change to text 2013-04-03 11:04:31 -04:00
Robin Ward 0e09c8b9b9 Merge pull request #622 from ZogStriP/prevent-users-from-uploading-files-other-than-images
prevent users from uploading files other than images
2013-04-03 07:39:55 -07:00
Robin Ward c2f1b70a6f Merge pull request #631 from kubabrecka/cs_update27
cs translation update
2013-04-03 06:51:42 -07:00
Régis Hanol a02b8730de keep French l10n up to date 2013-04-03 10:41:30 +02:00
Kuba Brecka 51b25e104f cs translation update 2013-04-03 09:21:23 +02:00
Robin Ward ee76f1926d Debugging Tool for Hot Topics 2013-04-02 18:00:53 -04:00
Kuba Brecka f957b0aee5 make post actions (likes, flags) translatable as whole sentences 2013-04-02 21:15:55 +02:00
Robin Ward e8d66beea5 Fix @notification text for non visitors 2013-04-02 11:58:12 -04:00
Robin Ward 753e3675b1 Merge pull request #625 from kubabrecka/cs_update23
cs translation client.cs.yml update
2013-04-02 06:51:04 -07:00
Robin Ward be0ce029e6 Merge pull request #626 from kubabrecka/cs_update25
cs translation server.cs.yml pluralization
2013-04-02 06:50:36 -07:00
Kuba Brecka 8245c0d9ce cs translation server.cs.yml pluralization 2013-04-02 15:07:11 +02:00
Kuba Brecka 6715e7c55a cs translation client.cs.yml update 2013-04-02 15:01:38 +02:00
Kuba Brecka b1249df598 update i18n:stats task to count pluralization based on locale setting 2013-04-02 14:56:26 +02:00
Régis Hanol 3524a93cfb prevent users from uploading files other than images 2013-04-02 11:38:15 +02:00
Sam 9c9087b99c less bloated browser update
no need for respond.js (ie8 compat stuff)
preload store should not be naming stuff get, its reserved
bad js generates for preload store
use browse happy, cause its better
2013-04-02 17:44:48 +11:00
Jeff Atwood ae82b5d0ea Revert "forgot to sync untranslated languages"
This reverts commit 805e782845.
2013-04-01 21:42:57 -07:00
Jeff Atwood 805e782845 forgot to sync untranslated languages 2013-04-01 21:15:17 -07:00
Jeff Atwood 91f9dc7267 clarify tracking: seeing counts ain't a notify 2013-04-01 21:13:38 -07:00
Sam ade1f50f19 update pseudolocale, we really should do this in a post commit step 2013-04-02 11:23:20 +11:00
Sam 343dfaf503 Merge pull request #617 from kubabrecka/cs_pluralization_client
cs translation update - client.cs.yml correct pluralization
2013-04-01 17:20:36 -07:00
Sam ae32e3071c Merge pull request #618 from ZogStriP/keep-french-l10n-up-to-date-2013-04-01
keep French l10n up to date
2013-04-01 17:20:17 -07:00
Régis Hanol 7918bef7ff keep French l10n up to date 2013-04-02 01:09:08 +02:00
Sam f6ec8e01ec debug assets for debugging assets ... set to 1 in my .rvmrc 2013-04-02 09:50:00 +11:00
Kuba Brecka 01ed72d091 cs translation update - client.cs.yml correct pluralization 2013-04-01 23:21:17 +02:00
Neil Lalonde acb2a18e8a Show a Please Upgrade message to people on unsupported browsers 2013-04-01 16:19:57 -04:00
Jeff Atwood 6aaaa55ced oops, left out a word 2013-04-01 12:57:22 -07:00
Jeff Atwood e1e2768412 improve Email Deliverability Test email 2013-04-01 12:55:32 -07:00
Robin Ward 4e6b62b1f5 Much faster development mode reloading. 2013-04-01 14:32:24 -04:00
Robin Ward f429e95d4e Merge pull request #601 from kubabrecka/split_multiple_pluralization
split i18n strings where there are 2 pluralizable variables
2013-04-01 07:49:05 -07:00
Robin Ward 0fc86a9869 Merge pull request #605 from kubabrecka/i18n_pluralization
implement pluralization for server-side and js
2013-04-01 07:48:10 -07:00
Robin Ward 75d5049c0a Merge pull request #606 from ZogStriP/better-client-side-upload
improved images upload on the client side
2013-04-01 07:11:26 -07:00
Régis Hanol 72989dca7c improved images upload on the client side 2013-04-01 03:19:21 +02:00
Kuba Brecka af0a772629 implement pluralization for server-side and js 2013-03-31 19:55:02 +02:00
Kuba Brecka 1c50c99e9a split i18n strings where there are 2 pluralizable variables 2013-03-31 14:20:02 +02:00
Robin Ward 5bf3a0eaf3 Merge pull request #591 from potthast/german-l10n
Updated German l10n.
2013-03-30 12:11:25 -07:00
Robin Ward 9288be750f Merge pull request #594 from kubabrecka/cs_update22
update cs translation
2013-03-30 12:10:43 -07:00
Régis Hanol f5567c10e3 keep French l10n up to date 2013-03-30 16:25:08 +01:00
Kuba Brecka 1349b24c4a update cs translation 2013-03-30 13:43:06 +01:00
Neil Lalonde 25073e873f Fetch the list of problems more frequently on the admin dashboard 2013-03-29 15:48:26 -04:00
Martin Potthast 328b31d10e Updated German l10n. 2013-03-29 19:07:34 +01:00
Neil Lalonde 436515ec6c Dashboard checks for facebook, twitter, and github configs 2013-03-29 13:32:40 -04:00
Robin Ward 83ab544e0c Merge pull request #580 from kubabrecka/typo_fix0
typo fix in client.en.yml
2013-03-29 10:05:28 -07:00
Robin Ward 9f16309904 Merge pull request #581 from kubabrecka/cs_update21
update cs translation
2013-03-29 10:04:07 -07:00
Régis Hanol 6b4022dbfc keep French l10n up to date 2013-03-29 01:00:16 +01:00
Robin Ward 473a64d39d Add score, percent_rank to topics. Adds `HotTopic` model and consolidated job to calculate
hotness. Note: People on Heroku will have to update their jobs to the new structure
in Heroku.md
2013-03-28 15:39:54 -04:00
Jeff Atwood 9b103e6d97 correct error in new tab tooltip text 2013-03-28 11:49:01 -07:00
Kuba Brecka ae1561930b update cs translation 2013-03-28 19:26:58 +01:00
Kuba Brecka 435a46b729 typo fix in client.en.yml 2013-03-28 19:22:27 +01:00
Robin Ward 08267f5171 Merge pull request #481 from ZogStriP/selecting-default-landing-tab
FIX: allows the selection of the default landing tab
2013-03-28 08:27:05 -07:00
Robin Ward 2e4d73efc7 Merge pull request #578 from tonytonyjan/patch
Patch
2013-03-28 08:23:48 -07:00
Neil Lalonde b0fd89b4a7 Fix spelling of Github to GitHub 2013-03-28 11:07:55 -04:00
Régis Hanol 1668b5eab2 FIX: allows the selection of the default landing tab 2013-03-28 14:01:13 +01:00
Tony Jian 833d8a2557 correct zh_TW 2013-03-28 15:00:46 +08:00
Tony Jian d783769a67 correct zh_TW 2013-03-28 14:58:02 +08:00
Tony Jian f0728b16f6 add whitespace 2013-03-28 14:54:43 +08:00
Tony Jian 8cfa5d8e15 correct zh_TW 2013-03-28 14:37:09 +08:00
Sam 36e950ee07 Merge pull request #576 from tonytonyjan/patch
correct zh_TW locale
2013-03-27 23:06:39 -07:00
Tony Jian e93c8e0dce correct zh_TW locale 2013-03-28 13:42:30 +08:00
Régis Hanol 518203281d keep French l10n up to date 2013-03-28 03:19:23 +01:00
Robin Ward 36269cfbaa Rename 'popular' to 'latest'. First stab at 'Hot' tab. 2013-03-27 16:21:23 -04:00
Neil Lalonde 35f3cd9325 Make login buttons even smaller 2013-03-27 14:36:26 -04:00
Neil Lalonde 4711cb4716 Cleanup layout of login buttons 2013-03-27 12:23:11 -04:00
Robin Ward 4cb4843323 Includes post count in filter message by user 2013-03-27 10:53:43 -04:00
Robin Ward 15bd63cb64 Merge pull request #571 from ZogStriP/keep-french-l10n-up-to-date-2013-03-26
keep French l10n up to date
2013-03-27 06:58:57 -07:00
Kuba Brecka 125c2e7095 cs translation update 2013-03-27 09:25:37 +01:00
Régis Hanol 1db78185e0 keep French l10n up to date 2013-03-27 02:00:21 +01:00
Robin Ward af7f6fea28 Can set the `hotness` of a category. For the soon to be implemented "hotness" tab. 2013-03-26 18:08:58 -04:00
Neil Lalonde 5961ffc0e4 Add site setting to choose which share links to show and in what order 2013-03-26 17:17:37 -04:00
Neil Lalonde 7bfd66aa80 Add title attrs to share links 2013-03-26 17:17:37 -04:00
Robin Ward 6366c9f86d Specifically mention the visitor user level in the error messages for posts. 2013-03-26 15:44:31 -04:00
Robin Ward a30c019275 Show totals in best of yellow thigny. 2013-03-26 15:40:30 -04:00
Sam bd4fcfa412 Merge pull request #567 from ZogStriP/keep-french-l10n-up-to-date-2013-03-25
keeping French l10n up to date
2013-03-26 04:53:40 -07:00
Sam a2ada48089 it appears routes can be reloaded in dev under certain conditions 2013-03-25 18:08:23 -07:00
Sam c57ec611e1 basic api support 2013-03-25 18:04:46 -07:00
Sam 36d60befbd mini profiler fix for multisite 2013-03-25 18:04:46 -07:00
Régis Hanol 386967c56e keeping French l10n up to date 2013-03-25 23:15:10 +01:00
Sam 3f206e6c8c Merge pull request #493 from mikl/danish-translation
Danish translation.
2013-03-25 14:06:13 -07:00
Sam 6aaf868d9f Merge pull request #564 from kubabrecka/cs_update19
cs translation update
2013-03-25 14:05:26 -07:00
Robin Ward 19376bb17c Merge pull request #565 from alpacaaa/it_locale
Italian Translation!
2013-03-25 10:57:06 -07:00
Marco Sampellegrini ce98ce4b93 Italian Translation! 2013-03-25 18:35:38 +01:00
Neil Lalonde ba315c6610 If assets haven't been precompiled, fail to start server in production mode with a message 2013-03-25 13:33:58 -04:00
Robin Ward 6568b4aaa9 Better error messages when hitting max mentions/images/links 2013-03-25 12:27:09 -04:00
Robin Ward 7c505df6d4 Merge branch 'update-sidekiq' of git://github.com/nverba/discourse
Conflicts:
	config/initializers/sidekiq.rb
2013-03-25 10:26:13 -04:00
Kuba Brecka 4c5a276a46 cs translation update 2013-03-25 15:07:38 +01:00
tangramor a168ee25c7 Update zh_CN and zh_TW to current en.yml 2013-03-25 20:43:56 +08:00
Mikkel Hoegh 869df58461 Translated Discourse to Danish.
Squashed commit of the following:

commit db81f4a15e5df5ceb64499aba077acd2f8aed192
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 23:10:25 2013 +0100

    All the user-facing server strings.

commit c7fdf0d4351664cd2a731556b99ecf7f05a09cde
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 22:43:53 2013 +0100

    Like -> Synes godt om.

commit 0f6ba13d65e31246a0a0a9a31707928a14d7220c
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 21:27:51 2013 +0100

    Lots of server strings.

commit d66af8246fb6bc9ccff51f97931f1375b07f2d85
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 19:48:53 2013 +0100

    Translated user facing strings (almost).

commit a84fcf6ff70d7c304c86263d7917207e505e77b1
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Thu Mar 21 22:15:20 2013 +0100

    Even more client strings.

commit ccfc0f7189fb979973b642bee9ec1440f7d39970
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:43:08 2013 +0100

    More client strings.

commit c3e21cab82d95ad5abe92e95ad99acf401cbe9ec
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:12:44 2013 +0100

    Translated a bunch of client strings.

commit 65aad7129b3d9c7df62213522b37e3a413df35de
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:09:28 2013 +0100

    Started work on Danish translation.
2013-03-25 10:35:03 +01:00
Sam 622568fd57 fix mp in prd 2013-03-24 20:36:55 -07:00
Sam f921d1c547 comment out dead code
add some explanations
2013-03-24 20:09:28 -07:00
Sam 67c438434b wow, this has been broken for OH so long, we need to segragate users correctly so MP results work as expected 2013-03-24 19:52:03 -07:00
Sam 988a712c77 correct multisite functionality for omniauth 2013-03-24 17:21:18 -07:00
Sam deb603f41c Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax
Convert a lot of :a => b to a: b and bring peace to the world
2013-03-24 16:43:17 -07:00
Karan Misra 5dfb04e4b3 Convert a lot of :a => b to a: b and bring peace to the world 2013-03-25 05:07:36 +05:30
Sam 36a069488e Merge pull request #492 from sbauch/email-whitelist
added email whitelist SiteSetting feature to replicate email blacklist S...
2013-03-24 16:35:24 -07:00
Robin Ward 81c099a37c Merge pull request #551 from kubabrecka/cs_update
cs translation update
2013-03-23 13:57:43 -07:00
Kuba Brecka 274d665f35 extract hardcoded strings from admin reports 2013-03-23 18:06:28 +01:00
Kuba Brecka e38565ed1d cs translation update 2013-03-23 17:52:45 +01:00
nverba 0c7579ec9f Update Sidekiq and config 2013-03-23 14:49:50 +00:00
Robin Ward cb9106c3a7 Merge pull request #535 from ZogStriP/keep-french-l10n-up-to-date-2013-03-22
keep French l10n up to date [ci skip]
2013-03-23 07:38:03 -07:00
Robin Ward 3d210f143b Merge pull request #538 from kubabrecka/i18n_spec
adding i18n integrity check for valid YAML and valid content
2013-03-23 07:37:35 -07:00
Sam bceb124da6 correct line endings 2013-03-23 03:19:26 -07:00
Sam 40b2f0f7d9 update better errors
allow me to pass a special IP address in dev mode so I can debug ( set TRUSTED_IP )
2013-03-23 03:16:49 -07:00
Jeff Atwood 38285b6219 for PMs, switch to envelope glyph instead of lock 2013-03-23 02:46:50 -07:00
Kuba Brecka 624649ddc2 adding i18n integrity check for valid YAML and valid content 2013-03-23 08:57:31 +01:00
Sam 4907d162ef Merge pull request #534 from kubabrecka/cs_update
update cs translation
2013-03-22 19:28:50 -07:00
Régis Hanol d2e47cad5f keep French l10n up to date 2013-03-22 23:57:23 +01:00
Neil Lalonde 158cda7628 Add moderator and admin count to dashboard 2013-03-22 17:50:34 -04:00
Kuba Brecka 260a113bea update cs translation 2013-03-22 22:07:21 +01:00
Robin Ward 86eaf10c3e Fix i18n integrity issue 2013-03-22 16:01:05 -04:00