Skip to content

Commit

Permalink
Merge pull request #2 from btcffm/2024-04-english-version
Browse files Browse the repository at this point in the history
add: English version
  • Loading branch information
0xB10C committed Apr 19, 2024
2 parents ac3cde4 + 6db16f9 commit 0d0a252
Show file tree
Hide file tree
Showing 25 changed files with 173 additions and 31 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
public
.hugo_build.lock
30 changes: 10 additions & 20 deletions assets/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,13 @@ header h2 {
}

.header-top-right {
display: flex;
align-items: center;
justify-content: center;
}

.header-top-right a {
color: var(--link-color);
}

.header-top-left {
Expand Down Expand Up @@ -635,29 +642,12 @@ code.has-jax {
display: block;
}

.post-translations {
margin-left: 0.5em;
list-style: none;
padding: 0;
display: inline;
font-size: 14px;
}

.post-translations > li {
display: inline;
}

.post-translations > li:not(:last-child)::after {
content: "|";
display: inline-block;
}

.post-translations > li a {
.post-translations a {
color: var(--link-color);
}

.post-translations > li a:hover,
.post-translations > li a:focus {
.post-translations a:hover,
.post-translations a:focus {
color: var(--link-state-color);
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
19 changes: 19 additions & 0 deletions content/en/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
+++
title = 'Home'
date = 2009-01-03T14:00:00+01:00
draft = false
+++

The Frankfurt Bitcoin Meetup is the continuation of the "original" Frankfurt
meetup started in 2013. We meet on every third Thursday.

From September through April we meet in a beautiful co-working space called
[Die Zentrale] in Bornheim. During the summer, we'll meet somewhere outside:
In a public park, a BBQ place or a beer garden - your input on cool locations
is welcome!

[Die Zentrale]: https://die-zentrale-ffm.de/

We rely on donations to finance the location and drinks. You can contribute [here].

[here]: https://geyser.fund/project/frankfurterbitcoinmeetup
7 changes: 7 additions & 0 deletions content/en/meetup/2023-09-21.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "September 2023: 10 years Bitcoin FFM - Founders Panel"
location = "Die Zentrale, Berger Str. 175"
date = 2023-09-21T18:00:00+01:00
+++

We celebrate 10 years Bitcoin FFM. The meetup funders will join us for a _Founders Panel_.
12 changes: 12 additions & 0 deletions content/en/meetup/2023-10-19.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
+++
title = "October 2023: Self-Custody & new features in Bitcoin Core v26.0"
location = "Die Zentrale, Berger Str. 175"
date = 2023-10-19T18:00:00+01:00
+++

[Mathias](https://twitter.com/Mathias_U1F596) is giving a talk about "Self-Custody",
and [Timo](https://twitter.com/0xb10c) will explain new featues like P2P traffic encryption
([BIP324]) and [assumeUTXO] of Bitcoin Core v26.0.

[assumeUTXO]: https://github.com/jamesob/assumeutxo-docs/tree/master/proposal
[BIP324]: https://github.com/bitcoin/bips/blob/master/bip-0324.mediawiki
7 changes: 7 additions & 0 deletions content/en/meetup/2023-11-16.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = "November 2023: On-chain Analysis & Privacy"
location = "Die Zentrale, Berger Str. 175"
date = 2023-11-16T18:15:00+01:00
+++

[Janik](https://twitter.com/J_R_Rockefeller) is presenting on "On-chain Analysis & Privacy".
52 changes: 52 additions & 0 deletions content/en/meetup/2023-12-21.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
+++
title = "December 2023: Socratic Seminar #1 with Emzy, Timo and Fabian"
location = "Die Zentrale, Berger Str. 175"
date = 2023-12-21T18:15:00+01:00
+++

[Emzy](https://twitter.com/emzy), [Timo](https://twitter.com/0xb10c),
and [Fabian](https://twitter.com/fjahr) are holding a Socratic Seminar.


<details>
<summary>
Topics
</summary>

- Mining: F2Pool filtering OFAC, Ocean, DEMAND, StratumV2
- [Zensur im Bitcoin-Netzwerk? F2Pool filtert OFAC-sanktionierte Adressen!](https://www.blocktrainer.de/zensur-im-bitcoin-netzwerk-f2pool-filtert-ofac-sanktionierte-adressen/)
- https://b10c.me/observations/08-missing-sanctioned-transactions/
- [DEMAND Pool](https://twitter.com/bitentrepreneur/status/1730350206317703648)
- [Ocean Pool](https://ocean.xyz/blocktemplate)
- Review technical bitcoin transcripts and earn sats
- https://btctranscripts.com
- https://twitter.com/adamcjonas/status/1725247716425675002
- https://review.btctranscripts.com/home
- Cluster Mempool
- https://github.com/bitcoin/bitcoin/issues/27677
- https://github.com/bitcoin/bitcoin/pull/28676
- https://delvingbitcoin.org/c/implementation/wg-cluster-mempool/9
- 83.7 BTC fees
- https://mempool.space/tx/b5a2af5845a8d3796308ff9840e567b14cf6bb158ff26c999e6f9a1f5448f9aa
- https://twitter.com/83_5BTC/status/1728873072349069352
- https://www.antpool.com/newsDetail/457-Announcement
- BitVM
- https://bitvm.org/bitvm.pdf
- https://twitter.com/robin_linus/status/1721969594686926935
- Mailing Lists Future and Delving Bitcoin Forum
- https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2023-November/022134.html
- https://lists.linuxfoundation.org/pipermail/lightning-dev/2023-December/004231.html
- https://delvingbitcoin.org/
- Replacement Cycling Attack
- https://lists.linuxfoundation.org/pipermail/lightning-dev/2023-October/004122.html
- https://twitter.com/mononautical/status/1715736832950825224
- https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2023-December/022188.html
- Bitcoin Core 26.0 Release
- https://github.com/bitcoin/bitcoin/blob/26.x/doc/release-notes.md
- [Wortmarke gesichert: Deutsche Firma geht gegen „HODL“-Merchandise vor!](https://www.blocktrainer.de/als-wortmarke-gesichert-deutsche-firma-geht-gegen-hodl-merchandise-vor/)
- [CVE-2023-50428 und der fragwürdige Versuch einen „Bug“ im Bitcoin-Netzwerk zu beheben!](https://www.blocktrainer.de/cve-2023-50428-und-der-fragwuerdige-versuch-einen-bug-im-bitcoin-netzwerk-zu-beheben/)
- Stable channels
- https://twitter.com/tonklaus/status/1729567459579945017
- https://www.nobsbitcoin.com/10101-v1-6-1-public-beta/

</details>
7 changes: 7 additions & 0 deletions content/en/meetup/2024-01-18.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = 'January 2024: Oridinals and Inscriptions'
location = "Die Zentrale, Berger Str. 175"
date = 2024-01-18T18:15:00+01:00
+++

Starting at 19:15, [Lightrider](https://twitter.com/LightRider5) and [Freerk](https://twitter.com/freerko) from [Ordimint](https://twitter.com/ordimint) will present on the topic "Ordinals and Inscriptions".
7 changes: 7 additions & 0 deletions content/en/meetup/2024-02-15.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = 'February 2024: Generational wealth - Nachlassplanung und Verwahrung'
location = "Die Zentrale, Berger Str. 175"
date = 2024-02-15T18:15:00+01:00
+++

Starting at 19:15, [genexyz_org](https://twitter.com/genexyz_org) will present on "Generational wealth - Nachlassplanung und Verwahrung".
7 changes: 7 additions & 0 deletions content/en/meetup/2024-03-21.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
+++
title = 'March 2024: DAOs im Bitcoin-Kontext - be your own exchange, fund, and everything'
location = "Die Zentrale, Berger Str. 175"
date = 2024-03-21T18:15:00+01:00
+++

Starting at 19:15, Jochen will present on "DAOs im Bitcoin-Kontext - be your own exchange, fund, and everything".
9 changes: 9 additions & 0 deletions content/en/meetup/2024-04-18.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
+++
title = 'April 2024: (Pre) Halving Party & "The Genesis Book"'
location = "Die Zentrale, Berger Str. 175"
date = 2024-04-18T18:15:00+01:00
+++

Pre-halving party - the last meetup with 6.25 BTC block subsidy!
[Aaron van Wirdum](https://twitter.com/AaronvanW) will join us to showcase
his new book "[The Genesis Book](https://thegenesisbook.com/)".
26 changes: 19 additions & 7 deletions hugo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
languageCode = 'de-de'
languageCode = 'en-US'
title = 'Frankfurt Bitcoin Meetup'
theme = "anubis2"
defaultContentLanguage = "de"
defaultContentLanguage = "en"
showFullContent = true

[author]
Expand Down Expand Up @@ -45,11 +45,23 @@ url = "https://www.meetup.com/de/bitcoin-frankfurt/"
id = "donate"
url = "https://geyser.fund/project/frankfurterbitcoinmeetup"


[languages.de]
languageName = "Deutsch"
[languages.de.params]
languageCode = "de-de"
defaultContentLanguage = 'en'
defaultContentLanguageInSubdir = true
[languages]
[languages.de]
contentDir = 'content/de'
disabled = false
languageCode = 'de-DE'
languageDirection = 'ltr'
languageName = 'Deutsch'
weight = 2
[languages.en]
contentDir = 'content/en'
disabled = false
languageCode = 'en-US'
languageDirection = 'ltr'
languageName = 'English'
weight = 1

[taxonomies]
category = "categories"
Expand Down
2 changes: 0 additions & 2 deletions layouts/_default/list.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ <h1 class="post-title">{{ i18n .Title | markdownify }}</h1>
{{ end}}

{{ range $pagesRange }}
GELBWURST
<div class="post-short-list h-entry">
<div class="post-header">
<header>
<h2 class="p-name post-title{{ if .Params.favorite }} favorite{{end}}{{ if .Params.draft }} draft{{end}}">{{ trim .Title " " | markdownify }}</h2>
{{ partial "post-language-switcher.html" . }}
{{ partial "post-info.html" . }}
</header>
</div>
Expand Down
1 change: 0 additions & 1 deletion layouts/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ <h1>
<div class="post-card" style="margin: 1em 0em; padding: 1em;">
<header>
<h2 class="{{ if .Params.draft }} draft{{end}}"><b>{{ trim .Title " " | markdownify }}</b></h2>
{{ partial "post-language-switcher.html" . }}
</header>
<div>
{{ .Content }}
Expand Down
6 changes: 5 additions & 1 deletion layouts/partials/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
{{ partial "site-title.html" . }}
</div>
<div class="header-top-right">
{{ partial "theme-switcher.html" . }}
{{ $languagesCount := $.Site.Home.AllTranslations }}
{{ if gt $languagesCount 1 }}
{{ partial "post-language-switcher.html" . }}
{{ end }}
{{ partial "theme-switcher.html" . }}
</div>
</div>
{{ partial "social-icons.html" . }}
Expand Down
10 changes: 10 additions & 0 deletions layouts/partials/post-language-switcher.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{{ if .IsTranslated }}
{{ $pageLang := .Page.Lang}}
{{ range (sort .AllTranslations ".Lang" "asc" ) }}
{{ if eq .Lang $pageLang }}
<span>{{ upper .Lang }} </span>&nbsp;
{{ else }}
<span><a href="{{ .Permalink }}">{{ .Lang }}</a>&nbsp;</span>
{{ end }}
{{ end }}
{{ end }}

0 comments on commit 0d0a252

Please sign in to comment.