<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/openstreetmap/openstreetmap-website/pull/6014'>https://github.com/openstreetmap/openstreetmap-website/pull/6014</a></p>

<h4>Commit Summary</h4>
<ul>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/commits/dd57075b7adaa4ed943213cf0ef401bbb2b29c96" class="commit-link">dd57075</a>  Test if preferred diary entry language is selected</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/commits/978c8f75b4bedfce2c341eace2c938b3988a5b83" class="commit-link">978c8f7</a>  Allow new diary entry language to be specified in params</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/commits/51905d6dcbf0ecbc37046a5c5a309a89101977a8" class="commit-link">51905d6</a>  Rename default_lang to diary_language_preference</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/commits/0617d688e3d2679aa07a75df88b1712c5c871a95" class="commit-link">0617d68</a>  Change user.preferred_language to user.default_diary_language supporting preferences</li>
  <li><a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/commits/0e8a26397d5e67ec208c01c253792f4b8e999c79" class="commit-link">0e8a263</a>  Add user.default_diary_language setter</li>
</ul>

<h4 style="display: inline-block">File Changes </h4> <p style="display: inline-block">(<a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/files">5 files</a>)</p>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/files#diff-29beaabe278fd17493296745cecb67919f0906b47b8246ab770f5517615d9ef7">.rubocop_todo.yml</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/files#diff-4b73866ef57c70fca07c0f330d7a57aae939b11e4aae0514f303df3aa3762f89">app/controllers/diary_entries_controller.rb</a>
    (13)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/files#diff-9802ca3c9c4cf89904fd44bc114e35ebdf2c5dd3d5b645491e2b253e1afef29b">app/models/user.rb</a>
    (18)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/files#diff-10a5c4533814c8b1222f0ef0833c82edd68584d85757fc431557b39813777c19">test/controllers/diary_entries_controller_test.rb</a>
    (64)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014/files#diff-91bef9fda3c55514e23a4a8edba948f68aad59b57951adcff0b11e9ea9159854">test/models/user_test.rb</a>
    (68)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/6014.patch'>https://github.com/openstreetmap/openstreetmap-website/pull/6014.patch</a></li>
  <li><a href='https://github.com/openstreetmap/openstreetmap-website/pull/6014.diff'>https://github.com/openstreetmap/openstreetmap-website/pull/6014.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6014">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLI7H47HT46CLFD72P326SB4ZAVCNFSM6AAAAAB5F7J5TKVHI2DSMVQWIX3LMV43ASLTON2WKOZTGA3DMMBXHA2DKMI">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLJUWVAXUWSTW22DI4T26SB4ZA5CNFSM6AAAAAB5F7J5TKWGG33NNVSW45C7OR4XAZNFJFZXG5LFVJRW63LNMVXHIX3JMTHLNQFE6M.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/6014</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/6014",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/6014",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>