Skip to content

Commit c9b23a9

Browse files
GargronGargron
authored
Merge branch 'master' into fix-object-type-nil-exception
2 parents 8a6d8de + 786e6f9 commit c9b23a9

9 files changed

+50
-7
lines changed

‎.env.production.sample

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ [email protected]
4444
# S3_PROTOCOL=http
4545
# S3_HOSTNAME=192.168.1.123:9000
4646

47+
# S3 (Minio Config (optional) Please check Minio instance for details)
48+
# S3_ENABLED=true
49+
# S3_BUCKET=
50+
# AWS_ACCESS_KEY_ID=
51+
# AWS_SECRET_ACCESS_KEY=
52+
# S3_REGION=
53+
# S3_PROTOCOL=https
54+
# S3_HOSTNAME=
55+
# S3_ENDPOINT=
56+
4757
# Optional alias for S3 if you want to use Cloudfront or Cloudflare in front
4858
# S3_CLOUDFRONT_HOST=
4959

‎app/views/user_mailer/confirmation_instructions.fi.html.erb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<p>Tervetuloa <%= @resource.email %>!</p>
2+
3+
<p>Voit vahvistaa Mastodon tilisi klikkaamalla alla olevaa linkkiä:</p>
4+
5+
<p><%= link_to 'Varmista tilini', confirmation_url(@resource, confirmation_token: @token) %></p>

‎app/views/user_mailer/confirmation_instructions.fi.text.erb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Tervetuloa <%= @resource.email %>!
2+
3+
Voit vahvistaa Mastodon tilisi klikkaamalla alla olevaa linkkiä:
4+
5+
<%= confirmation_url(@resource, confirmation_token: @token) %>

‎app/views/user_mailer/password_change.fi.html.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<p>Hei <%= @resource.email %>!</p>
2+
3+
<p>Lähetämme tämän viestin ilmoittaaksemme että salasanasi on vaihdettu.</p>

‎app/views/user_mailer/password_change.fi.text.erb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Hei <%= @resource.email %>!
2+
3+
Lähetämme tämän viestin ilmoittaaksemme että salasanasi on vaihdettu.

‎app/views/user_mailer/reset_password_instructions.fi.html.erb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<p>Hei <%= @resource.email %>!</p>
2+
3+
<p>Joku on pyytänyt salasanvaihto Mastodonissa. Voit tehdä sen allaolevassa linkissä.</p>
4+
5+
<p><%= link_to 'Vaihda salasanani', edit_password_url(@resource, reset_password_token: @token) %></p>
6+
7+
<p>Jos et pyytänyt vaihtoa, poista tämä viesti.</p>
8+
<p>Salasanaasi ei vaihdeta ennen kuin menet ylläolevaan linkkiin ja luot uuden.</p>

‎app/views/user_mailer/reset_password_instructions.fi.text.erb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Hei <%= @resource.email %>!
2+
3+
Joku on pyytänyt salasanvaihto Mastodonissa. Voit tehdä sen allaolevassa linkissä.
4+
5+
<%= edit_password_url(@resource, reset_password_token: @token) %>
6+
7+
Jos et pyytänyt vaihtoa, poista tämä viesti.
8+
Salasanaasi ei vaihdeta ennen kuin menet ylläolevaan linkkiin ja luot uuden.

‎config/locales/fi.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ fi:
1616
chronology: Aikajana on kronologisessa järjestyksessä
1717
ethics: 'Eettinen suunnittelu: ei mainoksia, no seurantaa'
1818
gifv: GIFV settejä ja lyhyitä videoita
19-
privacy: Julkaisu kohtainen yksityisyys aseuts
19+
privacy: Julkaisu kohtainen yksityisyys asetus
2020
public: Julkiset aikajanat
2121
features_headline: Mikä erottaa Mastodonin muista
2222
get_started: Aloita käyttö
2323
links: Linkit
24-
other_instances: muuhun palvelimeen
24+
other_instances: Muut palvelimet
2525
source_code: Lähdekoodi
2626
status_count_after: statusta
2727
status_count_before: Ovat luoneet
2828
terms: Ehdot
29-
user_count_after: käyttäjää
30-
user_count_before: Koti käyttäjälle
29+
user_count_after: käyttäjälle
30+
user_count_before: Koti
3131
accounts:
3232
follow: Seuraa
3333
followers: Seuraajat
@@ -130,8 +130,8 @@ fi:
130130
authorized_apps: Valtuutetut ohjelmat
131131
back: Takaisin Mastodoniin
132132
edit_profile: Muokkaa profiilia
133-
export: Datan vienti
134-
import: Datan tuonti
133+
export: Vie dataa
134+
import: Tuo dataa
135135
preferences: Ominaisuudet
136136
settings: Asetukset
137137
two_factor_auth: Kaksivaiheinen tunnistus

‎docs/Using-Mastodon/FAQ.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ While Mastodon is compatible with GNU social in terms of server to server commun
3636

3737
Because Mastodon has been created from a blank slate, it is much simpler to have the API mirror internal structures as closely as possible, rather than build an emulation layer. Secondly, the GNU social client API is actually a half-way implementation of the legacy Twitter API - that's the reason why it works with some older Twitter client apps. However, many of those apps are not maintained anymore, the GNU social API does not actually keep up with the real Twitter API and never fully implemented all its features; at the same time, the Twitter API was never meant for a federated service and so obscures some of the functionality.
3838

39+
3940
#### How is Mastodon funded?
4041

4142
Development of Mastodon and hosting of mastodon.social is funded through my [Patreon (also BTC/PayPal donations)](https://www.patreon.com/user?u=619786). Beyond that, I am not interested in VC funding, monetizing, advertising, or anything of that sort. I could offer setup/maintenance services on demand.
4243

43-
The software is free and open source and communities should host their own servers if they can, that way the costs are more or less distributed. Obviously it'd be hard for me to pay the bills if literally everyone decided to use the mastodon.social instance only.
44+
The software is free and open source and communities should host their own servers if they can, that way the costs are more or less distributed. Obviously it'd be hard for me to pay the bills if literally everyone decided to use the mastodon.social instance only.

0 commit comments

Comments
 (0)